Convert #517271 to Flügger