Revert "Deliberately break the buildbot config to test the new Travis setup"

This reverts commit 86b1f478d56881bd0fac5b403af3da7ab7f0bef2.