Revert "use sv_yes and sv_no instead of creating a new SV"

This reverts commit be6b2de57d68341cd9e32676b8f7925967fe6971.