Convert #624638 to Flügger