Backed out changeset e75f3902b7f6 (bug 925308) for assertions