Convert #417459 to Flügger