Revert "Use M9 stuff"

This reverts commit ec1653052165120761493a13692d00aa75dfd404.
Revert "Trying to use pre-CAF jf kernel"

This reverts commit 46d88f312a5729c2d850a80bf90a37ab222e96bd.