Bug 911771 followup.  Just nuke the broken code.  r=CLOSED TREE