Convert #517231 to Flügger