Convert #228878 to Flügger