Minor changes/reverted or it won't boot.