Revert "Merge branch 'pep8'"

This reverts commit 50db8ee91d874bcee8920f3fc394f7269620c664, reversing
changes made to 30d31874952005c1a6317e3d96d23f99bbcc530b.