Backed out changeset 3d47686129ae (bug 1048252) because of build bustage

--HG--
extra : rebase_source : 727e289f47bfc9b1164914edeaf1eddba644cb0d