Fixed issue with kernel crashing by reverting and using #define's to disable experimental code.