This functionality is only needed in bootstrap now that kernel and userland share the same address-space. Fix #2699
Fix #2393