Convert #624228 to Flügger