Convert #624252 to Flügger