Bring back overlay

Change-Id: I0881b4788843b80dc459f2c4cae876d7f4156aab