Revert this on master after kolla queens branch is created Change-Id: Iee64bb23cfa6aa50203e14954b1dedd58d7f75a0