Convert #354972 to Flügger