This reverts commit d959de7a89. This broken our Travis CI, so I'm pulling it off while we investigate.
d959de7a89