Merge "Revert "Use frame info from CodeInfo.""