Revert to simple broker by default