Convert #517482 to Flügger