Revert "Fix SVACE issue"