diff --git a/Dockerfile b/Dockerfile
index b6b2277..6a86e66 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,21 +9,13 @@ RUN cd /root/ \
  && echo "int main() {}" > hello_world.cpp \
  && apt-get update \
  && apt-get install -y python cmake build-essential openjdk-9-jre-headless \
- && /root/emsdk/emsdk update-tags \
- && echo "test latest" \
  && /root/emsdk/emsdk install latest \
  && /root/emsdk/emsdk activate latest \
  && source /root/emsdk/emsdk_env.sh --build=Release \
  && emcc hello_world.cpp \
- && echo "test upstream (waterfall)" \
+ && /root/emsdk/emsdk update-tags \
  && /root/emsdk/emsdk install latest-upstream \
  && /root/emsdk/emsdk activate latest-upstream \
  && source /root/emsdk/emsdk_env.sh --build=Release \
- && emcc hello_world.cpp -s WASM_OBJECT_FILES=1 \
- && echo "test fastcomp (waterfall)" \
- && /root/emsdk/emsdk install latest-fastcomp \
- && /root/emsdk/emsdk activate latest-fastcomp \
- && source /root/emsdk/emsdk_env.sh --build=Release \
- && emcc hello_world.cpp \
- && emcc hello_world.cpp -s WASM=0
+ && emcc hello_world.cpp -s WASM_OBJECT_FILES=1
 
diff --git a/emsdk b/emsdk
index 131d6bf..4990002 100755
--- a/emsdk
+++ b/emsdk
@@ -1527,18 +1527,12 @@ def find_latest_nightly_sdk():
   else:
     return find_latest_nightly_32bit_sdk()
 
-def find_latest_waterfall_sdk(which):
+def find_latest_upstream_sdk():
   waterfall_lkgr = load_waterfall_lkgr()
   if not waterfall_lkgr:
     print('Failed to find an upstream lkgr')
     sys.exit(1)
-  return 'sdk-%s-%s-64bit' % (which, waterfall_lkgr[0])
-
-def find_latest_upstream_sdk():
-  return find_latest_waterfall_sdk('upstream')
-
-def find_latest_fastcomp_sdk():
-  return find_latest_waterfall_sdk('fastcomp')
+  return 'sdk-upstream-%s-64bit' % waterfall_lkgr[0]
 
 # Finds the best-matching python tool for use.
 def find_used_python():
@@ -2231,8 +2225,6 @@ def main():
         sys.argv[i] = str(find_latest_nightly_64bit_sdk())
       elif sys.argv[i] == 'latest-upstream' or sys.argv[i] == 'latest-clang-upstream':
         sys.argv[i] = str(find_latest_upstream_sdk())
-      elif sys.argv[i] == 'latest-fastcomp':
-        sys.argv[i] = str(find_latest_fastcomp_sdk())
 
   if cmd == 'list':
     print('')
diff --git a/emsdk_manifest.json b/emsdk_manifest.json
index e4f7570..fd91872 100644
--- a/emsdk_manifest.json
+++ b/emsdk_manifest.json
@@ -199,15 +199,6 @@
     "activated_path": "%installation_dir%/emscripten",
     "activated_cfg": "LLVM_ROOT='%installation_dir%/bin';BINARYEN_ROOT='%installation_dir%'"
   },
-  {
-    "id": "waterfall",
-    "version": "fastcomp-%waterfall-lkgr%",
-    "bitness": 64,
-    "linux_url": "https://storage.googleapis.com/wasm-llvm/builds/linux/%waterfall-lkgr%/wasm-binaries.tbz2",
-    "install_path": "fastcomp/%waterfall-lkgr%",
-    "activated_path": "%installation_dir%/emscripten",
-    "activated_cfg": "LLVM_ROOT='%installation_dir%/fastcomp/bin';BINARYEN_ROOT='%installation_dir%'"
-  },
   {
     "id": "clang",
     "version": "e1.13.0",
@@ -1558,12 +1549,6 @@
     "uses": ["waterfall-upstream-%waterfall-lkgr%-64bit", "node-8.9.1-64bit"],
     "os": "linux"
   },
-  {
-    "version": "fastcomp-%waterfall-lkgr%",
-    "bitness": 64,
-    "uses": ["waterfall-fastcomp-%waterfall-lkgr%-64bit", "node-8.9.1-64bit"],
-    "os": "linux"
-  },
   {
     "version": "%precompiled_tag32%",
     "bitness": 32,