This reverts commit a18debbf21.
a18debbf21
This week we started to remove some deployment flags. Not much done besides this.