This reverts commit 85f3934f. Reason for revert: breaks gtests on target Change-Id: I9f97fe4e7557027677824974568120f658bbd53a