(hmpp) Oops, revert some lines committed by error in 982fa9bee41