Backout ac48416672e7 for unexpected SM(r) failures.

Even if the there is a CLOSED TREE by the time I push.

--HG--
extra : rebase_source : b6ccfb766566415e50f1f48c6c738ed72f86babf