Merge pull request #7649 from annando/remove-de