This reverts commit 40e3f9f097cf607ad67c2094439a080104427b34. Change-Id: I319a351be0ad367102ec3aacaeb0f41c78da6dff