partial revert of 176d0f9fe5eacf9594bfcfccbfbf72b8d569ea24; celery was calling amqp