Back out revision 43927377e41c (bug 870787) and revision 25126626dd43 (bug 879319) for failing tests and contributing to a CLOSED TREE.