Convert #109285 to Flügger