Convert #228285 to Flügger