Backed out changeset 35575118c650 (bug 912794) for asserts.