Revert "Temporarily disable autotermination"

This reverts commit 70110ff1ff5eb7a219c36df0d47a0daaffd23be6.