Kernel config switcheroo

Change-Id: I46c5e24747850a333560f90c8e44deb46c6507e0