Convert #710585 to Flügger