Backed out changeset f4964171a9c0 (bug 994320) and changeset a4655f5da435 (bug 994318) for bustage.
CLOSED TREE