Convert #226951 to Flügger