Backed out changeset 7e55ef1c49d1 (bug 1063598) for assertion failures
CLOSED TREE