Backed out changeset 99b17c404db2 and e40a964458f8 for landing stuff that shouldn't have and then backing out stuff that should have stayed on a CLOSED TREE

--HG--
extra : amend_source : 54312955270ea4098a3add3cd0708866de2e40bb