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