Back to no-OC, stabler for most

Change-Id: I97a30868fac4fd6f2996b8547c55ec7aea61a29a