Convert #116267 to Flügger