Revert "Use instantShutdown when needed"

This reverts commit 25d5ae540f5d1d27f081ea218ef9544a9316d503.