Merge "Revert^6 "Ensure that OSR still is possible with jvmti""