Re: [PATCH OLK-5.10] Revert commits