Backed out changeset f8a861253c57 (bug 859521) due to bustage.