Merge "Revert "Workaround JDWP failures""