Stop relying on localflavor