Backout changeset 000ed86d069f (bug 861117) which caused bug 871560

--HG--
extra : rebase_source : 6359c671885b93f7885ca2cabfd8da772692d548