buildbots.  This rev was backported, so we will need to keep both branches
in sync, pending the outcome of the test after this checkin.