Merge once things are back to normal with devstack-f20 in rax. This reverts commit f22e31a3667006299187c7b5d51dfe0be1a3c2c7. Depends-On: I0880c850dedada893d6e3e7e922c2994ece74930 Change-Id: Iff6cab82cb27d3f89c2af8223cad156d29a34d86