Merge "Revert "Fix deoptimization with pending exception""