Convert #517379 to Flügger