Convert #517481 to Flügger