Convert #228843 to Flügger