Backed out changeset 21823bcb1ce9 (bug 1034593) for bustage.