Revert bunch of mods, to fix boot