Convert #149286 to Flügger