Revert to use Targeted version.

Change-Id: Ib6e9ad9a8d6b80bfaa3378ba1fa32056f6db6e98