This reverts commit 64daaeb3a785416c40ca320a8ad5afbaed9cc8e0. Change-Id: Ibf0cc7c583cd622e3325546c7e7430086f67ac2b