Convert #354470 to Flügger