Convert #228774 to Flügger