Merge "kernel: clean up this madness" into o8.0