Remove dependency on kernel experiment, will be rewritten else where