Convert #517887 to Flügger