[Git][openldap/openldap][master] ITS#9370 revert previous commit, alternate fix