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