Convert #624282 to Flügger