Convert #116339 to Flügger