Revert previous removing of pep8.py warnings

Somewhere was a bug. Difficult to locate, so a revert was the easiest
choice.