Merge "Revert "Move overflow checks into SkipCutBuffer""