Convert #322845 to Flügger