[PATCH OLK-5.10 0/2] Revert hibmc patches to fix null-ptr-deref