Convert #624438 to Flügger