Convert #517948 to Flügger