Re-introduce PR #930

TRT has unfortunately had to revert this breaking change to get CI and/or nightly payloads flowing again.

The original PR was https://github.com/openshift/cluster-ingress-operator/pull/930

To restore your change, create a new PR that reverts the revert and layers additional separate commit(s) on top that addresses the problem.

Contact information for TRT is available at https://source.redhat.com/groups/public/atomicopenshift/atomicopenshift_wiki/how_to_contact_the_technical_release_team. Please reach out if you need assistance in relanding your change or have feedback about this process.