This reverts commit 1a37866929ca05acba71cdadad87dd563b6064dd. Change-Id: I04cdfe02f70b608b1951c4dee38cb4e345f198d5