Backed out changeset 3ccf22fd2347 (bug 937132) for bustage. a=backout
DONTBUILD