Convert #623271 to Flügger