Convert #228927 to Flügger