Backed out changeset a1d7b16101c7 (bug 1064669). r=mfinkle