This reverts commit 7859590acd229b66c1953d3d4ed9538261d6b898. Change-Id: Iab71d4a2ce0eb6dbbab685433a7c991015402e19