In a followup change, Grace will need to remove EXTRA_APPEND_LOCATION as we are replacing that with this.