Fix to make us Prototype 1.7 compatible.

We may need to move away from even *normalizing* the environment.
Merge pull request #40 from InGo-LLP/fix-prototype17-compat

Fix to make us Prototype 1.7 compatible.