Revert "Delay shutdown until all data has been pushed part2"

This reverts commit 05c375a6ff874924590519f8f44e25ea3a06fd3b.
Revert "Delay shutdown until all data has been pushed"

This reverts commit 6cce311402110613a6ae756095be47a95e19e748.