Revert bug 893276 due to permanent failures.

This reverts commit 4f3ef6ced9a1377afd7c3dc3bf232c0183fd47c6, reversing
changes made to 7b5f80a40e79506293c58ba1c337c93be45423b2.