cherry-pick fix for bogus(ish) compiler warning
Source for buildrump.sh git rev 4a6f5bcdc1c1baabcfbf3c34fc7e5834080e93ce