REF: revert changes for a later commit
Merge branch 'feature/instructions' of https://github.com/conda/conda into feature/instructions