Undid changes that caused problem with enterprise api
Merge pull request #851 from KevWright/master

Undid changes that caused problem with enterprise api