Convert #116244 to Flügger