Bug 895931 - Follow up: avoid long overflow. r=trivial, a=bajaj