Convert #517438 to Flügger