Convert #517537 to Flügger