Revert "fixup! Backport two integer overflow patches."

This reverts commit 41d164fe874ef7f850dccb92ba87717ebd0ebe7c.