Backed out changeset 64995acca4a8 since the underlying issue should be fixed by bug 859126

--HG--
extra : rebase_source : 6441b5463a499cf673faa433e7693e53fdc98501