Convert #354737 to Flügger