Backed out changeset fcdc81cdaa67 (bug 937132) for bustage. a=backout
DONTBUILD FML