Convert #228261 to Flügger