Partially revert r917: Leave bootstrap functionality in kernel/cross.h