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