Convert #354366 to Flügger