Attempt to fix celery/celery#1965