Backed out changeset 23d7c82e6480 (bug 883498)

--HG--
extra : rebase_source : f148e948bda2a7042cac89af8f1c2a954c9e58ec
Backed out changeset 67d926ddd43e (bug 883498)

--HG--
extra : rebase_source : 5b9e7f4d0dc1817b46ca93c8c35adc568fc22443