Backed out changeset 535756591289 (bug 939040) for ticking an assertion after the latest m-c merge; CLOSED TREE