Convert #517549 to Flügger