Revert "[4.0] Fix SVACE issue"