Convert #624317 to Flügger