Convert #228074 to Flügger