Revert "Merge branch 'fix-ci-20220523' into 'os-build'"

This reverts merge request !1790 (merged) as it is causing self tests to fail.

Signed-off-by: Patrick Talbert ptalbert@redhat.com