Revert the reversion.

I forgot that the version of flake8 which doesn't break hasn't been
released yet.