Suggestions from conda/conda#665

Closes conda/conda#665.