diff --git a/tensorflow/python/BUILD b/tensorflow/python/BUILD
index c4c00615e8a..b167b64197e 100644
--- a/tensorflow/python/BUILD
+++ b/tensorflow/python/BUILD
@@ -812,7 +812,7 @@ py_library(
     ],
     srcs_version = "PY2AND3",
     deps = [
-        ":util",
+        "//tensorflow/core:protos_all_py",
     ],
 )
 
diff --git a/tensorflow/python/framework/error_interpolation.py b/tensorflow/python/framework/error_interpolation.py
index 26ae7c1f69b..e9529d0e78d 100644
--- a/tensorflow/python/framework/error_interpolation.py
+++ b/tensorflow/python/framework/error_interpolation.py
@@ -30,7 +30,6 @@ import re
 import six
 
 from tensorflow.core.protobuf import graph_debug_info_pb2
-from tensorflow.python.util import tf_stack
 
 _NAME_REGEX = r"[A-Za-z0-9_.][A-Za-z0-9_.\-/]*?"
 _TAG_REGEX = r"{{{{({name}) ({name})}}}}".format(name=_NAME_REGEX)
@@ -199,7 +198,7 @@ def _find_index_of_defining_frame_for_op(op):
   # Index 0 of tf_traceback is the outermost frame.
   tf_traceback = op.traceback
   size = len(tf_traceback)
-  filenames = [frame[tf_stack.TB_FILENAME] for frame in tf_traceback]
+  filenames = [frame.filename for frame in tf_traceback]
   # We process the filenames from the innermost frame to outermost.
   for idx, filename in enumerate(reversed(filenames)):
     contains_bad_substrings = [ss in filename for ss in _BAD_FILE_SUBSTRINGS]
@@ -262,7 +261,7 @@ def create_graph_debug_info_def(operations):
     node_name = func + op.name
     node_to_trace[node_name] = _compute_useful_frames(op, 10)
     for frame in node_to_trace[node_name]:
-      all_file_names.add(frame[tf_stack.TB_FILENAME])
+      all_file_names.add(frame.filename)
 
   # Sets the `files` field in the GraphDebugInfo proto
   graph_debug_info_def.files.extend(all_file_names)
@@ -279,8 +278,8 @@ def create_graph_debug_info_def(operations):
     trace_def = graph_debug_info_def.traces[node_name]
     for frame in reversed(frames):
       trace_def.file_line_cols.add(
-          file_index=file_to_index[frame[tf_stack.TB_FILENAME]],
-          line=frame[tf_stack.TB_LINENO])
+          file_index=file_to_index[frame.filename],
+          line=frame.lineno)
 
   return graph_debug_info_def
 
@@ -318,10 +317,10 @@ def compute_field_dict(op, strip_file_prefix=""):
     }
   """
   frame = _get_defining_frame_from_op(op)
-  filename = frame[tf_stack.TB_FILENAME]
+  filename = frame.filename
   if filename.startswith(strip_file_prefix):
     filename = filename[len(strip_file_prefix):]
-  lineno = frame[tf_stack.TB_LINENO]
+  lineno = frame.lineno
   defined_at = " (defined at %s:%d)" % (filename, lineno)
   colocation_summary = _compute_colocation_summary_from_op(op)
   device_summary = _compute_device_assignment_summary_from_op(op)
@@ -356,7 +355,7 @@ def traceback_files_common_prefix(all_ops):
       continue
     for op in ops:
       for frame in op.traceback:
-        filename = frame[tf_stack.TB_FILENAME]
+        filename = frame.filename
         if "<embedded" not in filename:
           files.add(filename)
   return os.path.split(os.path.commonprefix(list(files)))[0]
diff --git a/tensorflow/python/framework/errors_impl.py b/tensorflow/python/framework/errors_impl.py
index caaeab40254..e62e20417e6 100644
--- a/tensorflow/python/framework/errors_impl.py
+++ b/tensorflow/python/framework/errors_impl.py
@@ -28,7 +28,6 @@ from tensorflow.python.framework import error_interpolation
 from tensorflow.python.util import compat
 from tensorflow.python.util import deprecation
 from tensorflow.python.util import tf_inspect
-from tensorflow.python.util import tf_stack
 from tensorflow.python.util.tf_export import tf_export
 
 
@@ -37,12 +36,10 @@ def _compact_stack_trace(op):
   compact_traces = []
   common_prefix = error_interpolation.traceback_files_common_prefix([[op]])
   for frame in op.traceback:
-    frame = list(frame)
-    filename = frame[tf_stack.TB_FILENAME]
+    filename = frame.filename
     if filename.startswith(common_prefix):
       filename = filename[len(common_prefix):]
-      frame[tf_stack.TB_FILENAME] = filename
-    compact_traces.append(tuple(frame))
+    compact_traces.append((filename, frame.lineno, frame.name, frame.line))
   return compact_traces
 
 
diff --git a/tensorflow/python/util/tf_stack.py b/tensorflow/python/util/tf_stack.py
index 7cde5198ee2..0dfc03e37ce 100644
--- a/tensorflow/python/util/tf_stack.py
+++ b/tensorflow/python/util/tf_stack.py
@@ -40,13 +40,6 @@ else:
   _get_thread_key = thread.get_ident
 
 
-# Names for indices into TF traceback tuples.
-TB_FILENAME = 0
-TB_LINENO = 1
-TB_FUNCNAME = 2
-TB_CODEDICT = 3  # Dictionary of Python interpreter state.
-
-
 _source_mapper_stacks = collections.defaultdict(list)
 _source_filter_stacks = collections.defaultdict(list)