Backed out changeset 2b2f69d46d30 (bug 975182) for SM(arm) failures.
CLOSED TREE