Partial revert to a working state

Does it boot? yes - has bugs? Yes, goes into recovery on reboot.
Do not try it

Change-Id: I1911f73a7f1ca26e82e325c6a18bce677125bba5