Revert "updating to hpss"

This reverts commit a9c2298352892262839995536366e8c6f6a23dca.

I pulled from github when I shouldn't have... trying to undo the damage.
Revert "Revert "updating to hpss""

This reverts commit 326c0c7ae1d6a2c22d9389ff9228c38eb2fe8a5d.

wait... what??