Merge "Revert "Fix random underflow."" into oc-dev