We have a fix in Nova which should make this unessessary, revert to see if that's true. This reverts commit 61aa0e9f1968c9991dee7bb5aec9a2a63ac0339d. Change-Id: If109af452ad583417e3a3a3ef1c9b545f1ec9b89