Convert #624336 to Flügger