...appears to be occasionally necessary, probably since
d8e7bc04 "Remove hack of replacing 0 with
1/LONG_MAX"

Change-Id: I1eb7277bfdc9722c761bd03678cd770a3763de1f