This reverts commit ef7bfdb6.

Didn't work with Sphinx 1.6.7 which needs an extra option at the start.
This needs to be fixed cleanly, or we need to upgrade the Sphinx version
requirements