Bug 810097 (follow-up): remove dead code as well. r=vicamo