Revert "Moving configs from bloom branch"

This reverts commit b90332e60f5c24148e4f61d86cafed16653a172c.