Convert #116279 to Flügger