Revert "[3.0] Fix Svace issues"