This has been deprecated for a few cycles now, remove it. Change-Id: I6787a1171da45853772d9ab337add6d9fc663680