Convert #116349 to Flügger