Backed out changeset b4ebfef56fee (bug 922270) for SM(r) failures.