This reverts commit aa6a39b694ac1054c2e9cace60bbd79b8473f114. Change-Id: I00e1de89ba85f7d04bf983d8617b1da3a43d768e