Bug 1046964 - Remove some dead code (r=Waldo)
Bug 950745 - Back out assertions that are triggering too often