changes to inspiral_hipe are also required, pending Original: 01dbc4b5a103e04aedcffc4fa66c29f2b56938f2