diff --git a/requirements.txt b/requirements.txt
index 0dbe196e..870cf6c2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
 Cython>=0.28,<1.0; python_version == '3.7'
 PyStemmer==1.3.0
-bblfsh==2.12.7
+bblfsh==2.9.13
 modelforge==0.11.1
 sourced-jgit-spark-connector==2.0.1
 parquet==1.2
diff --git a/setup.py b/setup.py
index 86c15e02..a066dc9e 100644
--- a/setup.py
+++ b/setup.py
@@ -42,11 +42,11 @@
         "scikit-learn>=0.19,<1.0",
         "tqdm>=4.20,<5.0",
         "typing;python_version<'3.5'",
+        "pandas<0.21",
     ],
     extras_require={
         "tf": ["tensorflow>=1.0,<2.0"],
         "tf_gpu": ["tensorflow-gpu>=1.0,<2.0"],
-        "pandas": ["pandas>=0.24.1,<1.0"],
     },
     tests_require=["docker>=3.6.0,<4.0"],
     package_data={"": ["LICENSE.md", "README.md"],