Revert "Opt for quicker shutdown"

This reverts commit de4744f8857a28d613d2afd3fa91eddf32bed133.
Revert "If we are out of sync we will also want to bail because we are in an"

This reverts commit 6228787b0fe7fbd2d53bca9bba9fc764c0b1122e.
Opt for a quicker shutdown