Ticket 49789 - backout original fix as it caused a regression in FreeIPA
Description: This change broke FreeIPA, so for now we need to back it out
https://pagure.io/389-ds-base/issue/49789
(cherry picked from commit 172c60a26a54a18d9716abadde82ba27d25a79f9)