Revert to mainstream, temporarily suspend doctests.
pep8