reverted to main branch since EnvHash and ENV should be equal and we need to request as few changes to main master as possible