Convert #469587 to Flügger