Revert to GH1s now that they work for non-subtracted things