This reverts commit bf0be0a8030b91c7e75c23230c1f89a1536aa7eb. Change-Id: I40b852889980473aea02828b5b0fe29c21951638