[SMSS] Revert commit 131bc73