Bring back deleted files

Change-Id: I83c15edaad33f44120b0bd5aba0c1f06df221338