to a more appropriate place to remove an otherwise unneeded dependency Change-Id: If82707e937a9102de1a405a25f7f3f436df878e6