Revert "Commented state data in manifest to prevent conflicts"

Merged Hermes requested to merge revert-f403c6f9 into 12.0-stage

This reverts commit f403c6f9

Merge request reports