Further reverting for environment roles

This reverts commit bd385f4b92c0e8408bf2be00e201254670900254.

Conflicts:
	roles/base.json
	roles/production.json
	roles/staging.json