Backed out changeset 062226e8a2d2 (bug 1091015) for SM test failures.