Revert "Fix to service fee calc function - disallow including the current block's fees after daemon restart"

This reverts commit 76c643a77f4842cb7a5a7f4a8068a00889b1fbbb.
removing my last broken change