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