Convert #228259 to Flügger