This reverts commit a75e5892. Reason for revert: Fails jdwp tests. Change-Id: Ic883f4f0108b07f1609c6c6a9565eae5903bfd2c