Convert #228271 to Flügger