This reverts commit 822386f252.
This broke a number of tests when synced internally. We'll need to
investigate the breakages before relanding this.
This reverts commit 822386f252.
This broke a number of tests when synced internally. We'll need to
investigate the breakages before relanding this.