Convert #469867 to Flügger