Revert "Merge pull request #11315 from pauljt/bug888911" due to Travis CI failures.

This reverts commit 28a93e5eebada09920ab940252454326fc321c8f, reversing
changes made to 4c57c9b72f0277b5d0d9e4a7c5a13ac1eb7a1732.