This is a partial revert of e947f953370abe8ffc8713b8f3250a3ec39599fe. It caused a miscompile in downstream testing. Spoke with Philip offline. We believe the issue is that LSR needs to make sure the Step of the other AddRec is non-zero. Reverting until Philip is back from vacation.