Convert #147367 to Flügger