This reverts commit ce8e4dce. Reason for revert: breaking multiple targets in master Change-Id: I3ee74b314e06cb2c4d3d6da82ca116a91aad67d4