Remove merge pull request 4811.