Convert #517337 to Flügger