Revert "manifest: Tag clutter"

This reverts commit d29b8f592951772e14ebf2fb3cfb4f8c825b7c2a.