This reverts commit 2d8b8119. Reason for revert: Fails jdwp tests. Change-Id: I0577fd82df161183ccd73eaf61cbe6bf871ef410