Workaround for boto issue 1311 - https://github.com/boto/boto/issues/1311