Convert #228467 to Flügger