This reverts commit 3eee6b93de60491cbe51081403133dce1dcf863e. Change-Id: I96fba88027c06ff8a2722a570350ee4cf3bcfa10