Revert "dummy commit so we can keep our patches branch clear."

This reverts commit e4eefd525e5e63cd3e06ab8c5e19e51509107595.
Revert "This fixes various strtoll/strtol issues, including tests"

This reverts commit 060a2f2cb37e07a0d66d9862e0b5fa13429f3613.