am 5642a2e0: Merge "Revert "Move overflow checks into SkipCutBuffer""

* commit '5642a2e06c7be0697ab5079dc8484ec3e3c6ecfa':
  Revert "Move overflow checks into SkipCutBuffer"