Revert "Phase 2"

This reverts commit f7e27429b3c4d40b602d8e9616b923441e25fa87.
Possible Boot fix. Don't use flags where flags aren't specified..