Reverting RHEL-22732 patch due to regressions Resolves: RHEL-49779 Signed-off-by: Pavel Moravec <pmoravec@redhat.com>