revert a few OC things