Revert "Some init changes, maybe this time boots..."

This reverts commit aeee2f1c903ef7c393217987cd0885ce903a0171.