This reverts commit d27206ec92. Reason for revert: We have a red sanity and we believe it this is the commit that is causing ansible to fail. Change-Id: Ia0ef3bb302be88e04849cd0343fd849895c455f0
d27206ec92