I should not have pushed this: Revert "WIP legacy manifest"

This reverts commit 0e156bd162c71c63d23aecd714a23f1e5a091b76.