Revert due to nightly test failures.