Backed out changeset dd24124194d5 (bug 1108825) for SM(e) failures