This reverts commit 3d477f3a. Bug: 115837065 Reason for revert: Breaks jdwp tests. Change-Id: I09249331798970751a20c6b41675c3efef72adfb