Minor change to minimise diffs with upstream.

--HG--
branch : single-codebase