Convert #228643 to Flügger