Convert #165608 to Flügger