HPCC-9076 Rollback fix

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #4314 from richardkchapman/revert-spill-fix

HPCC-9076 Rollback fix

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>