Convert #624894 to Flügger