Revert "Upgrade to celery 3.x. (bug 823510)" ... for science!

This reverts commit b4c410f8097ea45800be0ba80b36224eb1cb8d55.