scm1
Merge branch 'svm'
Revert "Merge branch 'svm'"

This reverts commit 6d37ebda0280d5902c1f0c3811c98a07d8999946, reversing
changes made to 48286b79f9860725247b123dcbb86ff14a28471f.