Revert "Track from SM"

This reverts commit e3daedc134b26dae662166ae35429546aca2306f.