Back out 0a88dee3b92b:dc5cc7d7b84d (bug 911889) for beaucoup unexpected assertions

--HG--
extra : rebase_source : a2a13633b6028c99a3c732dbbafe8c800bc32071