Revert "Updated kernel config for herc/sky and added parts of Diablo Kernel from"
going to try a smaller change this time..
This reverts commit 577adfcf3d9b2a01d649cab49e99c97c213979c1.