Revert "Another try..."

This reverts commit 1f4053643ddff232233025d08b89a05a70c03b64.
Revert "Another try to use 2.1.3 with environment variable set."

This reverts commit d2b42df66af09aa1a17aae1a4f2b1d3204f915bd.