Convert #228238 to Flügger