Backed out changeset a7ea536288e0 (bug 1031267) for bustage..