Convert #228886 to Flügger