Revert "commit or die"

This reverts commit a522a22fc0af9aa4626f184b954d1b831520b7ce.