Reverting H-abstraction family back to previous commit c51ce95

Import script is not able to incorporate many of the manual changes made
to the family.
Merge branch 'master' into jp10