Add back Terminal

Change-Id: Ia6a21f777e7d72230895f2beb958251f2682e338