Revert "This should break the flakes8 check on Travis"

This reverts commit 91c3d6c30d75ce66228d52c74bf8a4d8e7628670.