Back out 9e5d584bc36c (bug 711180) for unexpected passes

--HG--
extra : rebase_source : 058c7afe46b9fbe2653f3e933c60dddb157c7804