Backed out changeset fa03d0230e50 (bug 862672) for Mnw failures. a=backout
DONTBUILD