Revert SOC-4034 commits from 4.0.x