Convert #228197 to Flügger