Revert "Merge pull request #31 from cschroed-usgs/NAWQAAN-39"

This reverts commit 894a81b58953d4f597563032e29564dad22f2a71, reversing
changes made to a64f6dd4367e636cd6b0c987c7fd55da77951cd4.
Merge pull request #32 from cschroed-usgs/master

Revert "Merge pull request #31 from cschroed-usgs/NAWQAAN-39"