Fix warm reboots that cause "JDWP" to tombstone.

This reverts commit 99ac88af7d0b1a6dd4900b37c0b872c28a5789cd
Revert "we need these"

This reverts commit 4ce403f6aca62dbd86b8127633fcfb898b8c19fe.