[PATCH OLK-5.10 0/2] Revert two stable patches to keep binary compatible