Backed out changeset 846ee7c7debf (bug 1020690) for bustage.
CLOSED TREE