Backed out changeset 97163e4941f2 (bug 869507) for checktest assertions and crashes.
CLOSED TREE