Revert me when merged

Stopping the circular dependency.
2 jobs for simple_manifest in 2 minutes and 55 seconds (queued for 1 second)