Backed out changeset f4b101378a07 (bug 1021527) by request