Backed out changeset 3cc898b3ef5d (bug 1057166) for build bustage

--HG--
extra : rebase_source : 724c8cb9e4c021a523a58af7e2f53a23aaa1901a