Convert #228949 to Flügger