Convert #624679 to Flügger