Remove merged pull request 4860.