Backed out changeset 738a4b230194 (bug 988326) for assertions