Adding headers back to ensure backwards compatibility