Back out ee27d1d8b302 (bug 836951) for depending on a patch that's being backed out
CLOSED TREE
Back out 196fbc36c878 (bug 840388) for asserting
CLOSED TREE