Convert #354982 to Flügger