This reverts commit 51a8ed8e95.
This has a typo ("exector"). The fix is obvious, but the bigger
issue is that it was not caught in testing, even though the main
purpose of the change was to re-enable tests. We should understand
why it wasn't caught in testing and resolve that before fixing and
unreverting.
Change-Id: I3ed407546fecc52d4a039f7959c0521511e6a00b