reverting changes in sign and hmsb unrelated to that branch