Convert #517228 to Flügger