This reverts commit 78eec3c16cab3ea1b2900d3cbebcb80002312169. Change-Id: I682a6b06533dde6d59ada6d83931af0d0d617976