diff --git a/python_apps/airtime_analyzer/airtime_analyzer/cloud_storage_uploader.py b/python_apps/airtime_analyzer/airtime_analyzer/cloud_storage_uploader.py
index 2ec91cdb5..1b25d7d35 100644
--- a/python_apps/airtime_analyzer/airtime_analyzer/cloud_storage_uploader.py
+++ b/python_apps/airtime_analyzer/airtime_analyzer/cloud_storage_uploader.py
@@ -5,6 +5,12 @@ import socket
 from boto.s3.connection import S3Connection
 from boto.s3.key import Key
 
+# Fix for getaddrinfo deadlock. See these issues for details:
+# https://github.com/gevent/gevent/issues/349
+# https://github.com/docker/docker-registry/issues/400
+u'fix getaddrinfo deadlock'.encode('idna')
+
+CLOUD_CONFIG_PATH = '/etc/airtime-saas/cloud_storage.conf'
 STORAGE_BACKEND_FILE = "file"
 SOCKET_TIMEOUT = 240
 
@@ -93,12 +99,6 @@ class CloudStorageUploader:
         # turning into deadlocks, we explicitly set the global default timeout period here:
         socket.setdefaulttimeout(SOCKET_TIMEOUT)
 
-        # Crazy workaround for a deadlock inside Python 2.7 where unicode hostname resolution can
-        # cause a deadlock because the import spins up a separate thread:
-        #  http://emptysqua.re/blog/weird-green-bug/
-        #  https://jira.mongodb.org/browse/PYTHON-607
-        unicode('foo').encode('idna')
-
         conn = S3Connection(self._api_key, self._api_key_secret, host=self._host)
         bucket = conn.get_bucket(self._bucket)