Convert #517491 to Flügger