Revert previous 3 commits to test Travis CI failures.