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