Sam says:
"We should revert this. I applied it in 1.3 and then fixed it for correctness."

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%404382