Convert #517847 to Flügger