Revert commits used to test Travis CI test failures.

End result of the experiment: The failure isn't related to the tests
added by this PR.