This reverts commit 86c7d721. Reason for revert: Broke several targets on git_master Change-Id: I0876582b5211db90e25897690d57de6b179a50c5