Convert #416491 to Flügger