Backed out changeset 4834a3833639 and c580afddd1cb (bug 985084 and bug 97500)

--HG--
extra : histedit_source : c580afddd1cb90bd3cccbc7abc8082132ffe2a3c%2C4371c5775a71d493e82f193b1cf15efd44566645