Convert #116228 to Flügger