Convert #417829 to Flügger