DS build: Revert only overridden features.