Revert "uniquify-env by default"

This reverts commit 8cf284330810988f1265e48e2fff2336110b6555.