Not sure if a TWN config change happened, but this breaks the repo pretty epically. This reverts commit 57237c2133. Change-Id: I3ed8140e7a9e052d4c547724648ce8859c27db38
57237c2133