Revert "remove all or die"

This reverts commit 03b0201d1ff9314493645589ae91d86f921c49e9.
properly reverse or die