Convert #228848 to Flügger