Convert #624287 to Flügger