Revert "low risk, potentially varint overflow bug patched thanks to BBR"

This reverts commit 4e2b2b942daa4206ec44c66e59863670dfe3fde4.