This reverts commit 7026cdf9e9.
This reverts commit 0675eb1b5d.
This reverts commit 3c88d3a9c4.
---
flake8 versions 2 and 3 are api incompatible and this update breaks
stuff. Version 3 should be added as a seperate expression and compatible
packages should use it explicitly.