Backed out changeset 8a25ee567449 (bug 938803)
Backed out changeset 53c0f65599fe (bug 938803) for asserting too much