revert r8596 for scripts where PEP8 isn't desired