Backed out changeset 1eebddd614eb (bug 962103) for causing bug 947550

--HG--
extra : rebase_source : 809b725149264001d341469ebae420aa19911af4