Revert "ROP-29 Exclude accrued from upfront fee for both non-IMM running and"

This reverts commit cbea4436dcc72872d9748281dcf1e5d0ccd6f98d.