Convert #149454 to Flügger