Re-applying RTD patch

See f6ea19042fccbc21a8a620e5d572b3739612447d for first attempt.
We had virtualenv problems in RTD land.