Merge "Revert "Revert^4 "Make class redefinition work with native methods on stack."""