Convert #469614 to Flügger