Backed out changeset 7abb50d91618 (bug 962325) for bustage.
CLOSED TREE