Convert #517477 to Flügger