revert part of commit unintentionally pushed

Change-Id: Icaeb0292d06e4ef88e91b0520ee6435769ed45eb