Reintroduce hittem fix, with regression-test rebuilds as required.