kernel - Revert part of the contig allocation work