Attempt to reset the hansonrobotics branch back to its original state.

I previously merged from the incorrect branch. This merge is meant to restore that state.