This reverts commit 12c160c51b. Re-sync branch with changes as shipped in el8. Resolves: RHEL-36337
12c160c51b
Resolves: #2189522