Revert "manifest: clean up"

This reverts commit 92df1aab2c37fa047d1f25e668a41f56ff025f12.

Conflicts:
	default.xml

Change-Id: I9ede6714f15db09ef10ad7f84132bde8899a20fc