This reverts commit a18debbf21.
a18debbf21
This week was spent further removing deployment flags, we also started to refine the tasks for the ESS work.