partly revert 89b83c3b88ea, since it failed to boot on SCC.
partly revert 89b83c3b88ea, since it failed to boot on SCC.

modeswitch/barrelfish,modeswitch/barrelfish,modeswitch/barrelfish,modeswitch/barrelfish,modeswitch/barrelfish