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

This reverts commit ef8f7c0906ccf0b257a6247d875cf356d29f7331.