Convert #624887 to Flügger