This reverts commit 43e75eaa83. Reason for revert: Doing this as part of the revert here - https://review.opendev.org/c/openstack/openstack-helm-infra/+/772733 Change-Id: I9c04a35c179d23ec1b7612b4f87d9d16352985cc
43e75eaa83