revert incremental delivery (#4534)

Commit

20 days ago

revert incremental delivery (#4534) will need to fix abort and merge back incremental delivery