This reverts RHEL-46761-5.patch applied in commit 835c6731c5. The revert is done via RHEL-46761-6.patch. Reason for revert: Fix corresponding to regression test needs additional fixes upstream before it is backported here. Related: RHEL-46761
835c6731c5