Partially backed out changeset 2aa62db58f24 (bug 673919) due to Web compat. a=bajaj