Undo workarounds

This is fixed in https://github.com/jcrocholl/pep8/issues/268.