Convert #228874 to Flügger