Convert #228687 to Flügger