Convert #446537 to Flügger