Merge pull request #782 from andreweskeclarke/master

Reverting the 5984 port changes
Merge pull request #783 from andreweskeclarke/master

Fixing export issues
Updating infrastructure