diff --git a/exampleTypescript/asyncAwait/README.md b/exampleTypescript/asyncAwait/README.md
index dd7ae09c1..2c482e5ed 100644
--- a/exampleTypescript/asyncAwait/README.md
+++ b/exampleTypescript/asyncAwait/README.md
@@ -1,8 +1,29 @@
-`async`/`await` in Protractor
-=============================
-
-`async`/`await` is a feature that may or may not be added to javascript in
-the future.  It is currently accessible via typescript if you compile using
-`tsc -t ES2015 <files>`.  Protractor supports returning a promise at the end of
-an `it()` block, so it indirectly supports `async`/`await` (so long as your
-programming environment supports it).
+`async`/`await` and the Web Driver Control Flow
+===============================================
+
+The Web Driver Control Flow is used to synchronize your commands so they reach
+the browser in the correct order (see [control-flow.md](
+../../docs/control-flow.md) for details).  In the future, the control flow is
+being removed, however (see [github issue](
+https://github.com/SeleniumHQ/selenium/issues/2969) for details).  Instead of
+the control flow, you can synchronize your commands with promise chaining or the
+upcomming ES7 feature `async`/`await`.  However, you cannot use a mix of
+`async`/`await` and the control flow: `async`/`await` causes the control flow to
+become unreliable (see [github issue](
+https://github.com/SeleniumHQ/selenium/issues/3037)).  So if you `async`/`await`
+anywhere in a spec, you should use `await` or promise chaining to handle all
+asynchronous activity (e.g. any command interacting with the browser) for the
+rest of that test.
+
+In the near future there will be an option to disable the Web Driver control
+flow entierly (see https://github.com/angular/protractor/issues/3691).  If you
+are using `async`/`await`, it is highly recommended that you disable the Web
+Driver control flow. 
+
+
+Compiling `async`/`await` syntax
+================================
+
+`async`/`await` syntax is currently accessible via typescript if you compile
+using `tsc -t ES2015 <files>`.  You can also compile it using [regenerator](
+  https://github.com/facebook/regenerator).
diff --git a/exampleTypescript/asyncAwait/spec.ts b/exampleTypescript/asyncAwait/spec.ts
index 87dd8eab6..159725c75 100644
--- a/exampleTypescript/asyncAwait/spec.ts
+++ b/exampleTypescript/asyncAwait/spec.ts
@@ -1,5 +1,4 @@
-// Same process for importing and compiling at ../spec.ts, except you need to
-// pass the `-t ES2015` flag to `tsc`.
+// See README.md for important details.
 import {browser, element, by, By, $, $$, ExpectedConditions} from 'protractor';
 
 describe('async function', function() {