Revert "Remove duplicate"

This reverts commit 7fc1a5288f6d04ffed492201b8807d600dc913de.
Revert "Cleanup manifest"

This reverts commit 8ba7f795c69bfb3197bce7ca87101ed3255bfd64.