Convert #147887 to Flügger