Convert #469339 to Flügger