Back out 6922ed98876a (bug 851603) for failing a test it should have removed
CLOSED TREE