This reverts commit 2511f4d0cdcfba504c6d6bf4ebf5254ee6f37cc1. Change-Id: I3072d9e799bb9924165b3ff66a67fe32381589a4