Revert "Jeez flake8, you're so picky"

This reverts commit e9c681aa41e4ff8fb77fe03e91bbe2210dfd5eba.