Convert #517077 to Flügger