Back out bug 1097116
Merge backout CLOSED TREE

--HG--
extra : amend_source : a86ee1ef29589ff7390a070ca4d55b65de4d0ce6