Backed out changeset 8dcb029b9ca5 (bug 880836) for asserts.
CLOSED TREE