DS build: Revert only overridden features.
Merge pull request #3290 from sergii-tkachenko/ds-build-soft-features-revert

DS build: Revert only overridden features.