Backed out changeset f66e3ccb0c41 and fdebf60103c3 (bug 981418)