Convert #624629 to Flügger