Breaks target tests. This reverts commit 5594f11f. Change-Id: I5ff4aab14bb241e287f042a9a90458e61306985e