Downgrade to SMVC v2

Downgrade to SMVC v2