Convert #147939 to Flügger