Revert "Set some defaults [1/2]"

This reverts commit b702d4271f8680107f2b2c9f3519bec157a4939e.
Say hello to OmniKang

Change-Id: I627cbfccecb6adf5bd04813e3f5401a653e20cf6