Backed out changeset 0a2e7ed17611 (bug 950438) for bustage. a=backout
DONTBUILD