Roll back changes to 'h' format code -- too much breaks. Other

changes stay.