Convert #446679 to Flügger