Reverted r6254 again since r6252 has been postponed.
Reverted r6254 again since r6252 has been postponed.

--HG--
extra : convert_revision : svn%3A77541ad4-5f01-0410-9ede-a1b63cd9a898/trunk%406255

lucius-feng/tg2,lucius-feng/tg2