This reverts commit 9f68f41a58. Caused breakage. Change-Id: I441737f61f6f38ed9f440211b52bbac0f74982e3
9f68f41a58