Convert #149765 to Flügger