Backed out changeset cc565d1677da (bug 930398) for bustage.