Thought it might be a good idea to only do this in the new kernel implementation (slower rollout).

But doesn't have to be just the raw kernel.