I think this should be disabled with the OC stuff I brought in