Back out ebf3963ed46a:f51e42ad12e2 (bug 947939) for still failing roboprovider

--HG--
extra : rebase_source : 47915961f0fe8416e88f0d0fcf974ae3ef93953c