temporarily revert to state at e265056 for testing
Merge pull request #173 from mwhite/temp-fix

temporarily revert to state at e265056 for testing