Convert #354903 to Flügger