Backout change tom ake sure it doesn't interfere with next release.

--HG--
branch : production