Convert #446535 to Flügger