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

This reverts commit fa25564c8c0f3b17b39a49e5a2dd70f2974cb0aa.