This reverts commit 01e1d321. Reason for revert: JDWP JIT and Interpreter tests on hosts failing. Change-Id: I95bbda936c573983ff0c6041267bffaa73315cb7