Revert "Manifest v2 changes"

This reverts commit 912d5dac43091bfb1f7681bbc79eabd6bf4aeb21.