Convert #228585 to Flügger