This reverts commit c22f2b7a9bd255544ef6492824a254e2fb53e561. Change-Id: I4b7ceb45da0ee77301c6323aa2ca12b76ca46738