Convert #469745 to Flügger