diff --git a/gclient_config.py b/gclient_config.py
index 23c62fe0e4..31ec36ee94 100644
--- a/gclient_config.py
+++ b/gclient_config.py
@@ -34,11 +34,8 @@ solutions = [{
     'name':
     'cpplint'
 }, {
-    # Tracking a bleeding-edge branch. Upgrade frequently.
-    # https://github.com/google/flatbuffers/pull/4898
-    # https://github.com/rw/flatbuffers/tree/2018-08-28--rw-flatbuffers-rust
     'url':
-    'https://github.com/rw/flatbuffers.git@93f91622561907e2e51662be897631b5e0ed5634',
+    'https://github.com/google/flatbuffers.git@919c929d30f3e344537793794cdae8b204d40f32',
     'name':
     'flatbuffers'
 }]
diff --git a/third_party b/third_party
index dfcd3c3237..ff175a4d08 160000
--- a/third_party
+++ b/third_party
@@ -1 +1 @@
-Subproject commit dfcd3c323742a3de4ae2550b2071110fb976e820
+Subproject commit ff175a4d08d5d5154ca6313bac53540dda063fe3