Convert #228247 to Flügger