diff --git a/tools/lib/framereader.py b/tools/lib/framereader.py
index 7c8628e342..8c17eaf005 100644
--- a/tools/lib/framereader.py
+++ b/tools/lib/framereader.py
@@ -25,7 +25,10 @@ from concurrent.futures import ThreadPoolExecutor, as_completed
 
 from tools.lib.cache import cache_path_for_file_path
 from tools.lib.exceptions import DataUnreadableError
-from tools.lib.filereader import FileReader
+try:
+  from xx.chffr.lib.filereader import FileReader
+except ImportError:
+  from tools.lib.filereader import FileReader
 from tools.lib.file_helpers import atomic_write_in_dir
 from tools.lib.mkvparse import mkvindex
 from tools.lib.route import Route
diff --git a/tools/lib/logreader.py b/tools/lib/logreader.py
index 85c1838ea1..4a41667192 100755
--- a/tools/lib/logreader.py
+++ b/tools/lib/logreader.py
@@ -11,7 +11,10 @@ import capnp
 import numpy as np
 
 from tools.lib.exceptions import DataUnreadableError
-from tools.lib.filereader import FileReader
+try:
+  from xx.chffr.lib.filereader import FileReader
+except ImportError:
+  from tools.lib.filereader import FileReader
 from cereal import log as capnp_log
 
 OP_PATH = os.path.dirname(os.path.dirname(capnp_log.__file__))