Convert #469774 to Flügger