Convert #469783 to Flügger