This change seems simple and harmless. It would be nice if it could be tested, verified, and committed separate from the whole series. If this change standalone on trunk creates no test regressions, then please put it in right away.