This broke stuff
Merge pull request #223 from jiwalker-usgs/master

Reverting