Revert "Fix issue where failing to spawn a shell in a new terminal would break keyboard"

This didn't work as expected.

This reverts commit 73fff50de2bff4e465809a8b8b3fb67be6773b34.