Parent change fails on bots. This reverts commit b764390e. Change-Id: I367772de07dd7242ca4e836f06c44d4952dc1f12