Revert "Clean up manifest"

This reverts commit 7fd1cb1ce49cb3763554c733cdb9cb02a7cea257.

Change-Id: I91ea3105876fc0685accc25997ad735220de5a30