This reverts commit 42e159434d7c6ea5154cbc6d530fe5d6af049a51. Change-Id: Iad1f9dff3e986a7f50fdb735f60366d5f501f5c6