This gross hack of ours doesn't quite work with openstacksdk. Change-Id: Icbf691a9014e00cc7bb3b59ab7e4f9cc647595ec