This reverts commit 4701b993569cc5c9347571f84db8973a95c35495. Change-Id: Id1a2f93f55b32e6544083254bb16e3d3722aa3dd