revert 'BUild for DS only'