Convert #614484 to Flügger