revert caf-new repos

and kernel