Convert #149686 to Flügger