Convert #354986 to Flügger