Fix To Get 2.5.0 Out The Door

[Ryan Baxter]

Hi Everyone,

Here is the review [1] for the defect we found when releasing 2.5.0.
I would appreciate if someone could take a look at the fix so we can
get 2.5.0 out the door.  Thanks.

[1] https://reviews.apache.org/r/12881/