This reverts commit 397ca8be. Change-Id: Id7f8dbe93d2a48a7f6261232499f73b7de8dd7b1 Reason: Build breakage.