Backed out changeset 8bf85356ef86 (bug 8430335)
Backed out changeset 9b01df568861 (bug 8430335) for assertions & incorrect bug number; CLOSED TREE