Revert "manifest: clean up"

This reverts commit 92df1aab2c37fa047d1f25e668a41f56ff025f12.