Convert #147337 to Flügger