[cvs-nhc98] Ensure that hat-trail calls the correct version of hat-por