After some talk with Adam and David. Lets remove this and make it always enabled for now.