Partial revert of 81d5bc153e0ca50a16505df7963819762b2d1917#1513

openshift-merge-bot[bot] merged 1 commit into

openstack-k8s-operators:mainopenstack-k8s-operators/openstack-operator:mainfrom

dprince:catalog_upgrade_revertdprince/openstack-operator:catalog_upgrade_revertCopy head branch name to clipboard