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