Convert #517534 to Flügger