Parent change breaks target tests. This reverts commit 80e6d737. Change-Id: Ic6510e2d6f05df88364f0f27836ac30e60064bf8