Convert #116390 to Flügger