Rollback the deep_merge update, we add this as part of our env bootstrap script