HACK to circumvent missing merge of https://github.com/boto/boto/pull/2758