This reverts commit 701eef07ab. Reason for revert: cleanup Change-Id: I489e8e79924c402ed5228781af4bd4065daca42e
701eef07ab