Merge "Keep COLUMN_LOCAL_URI working for now." into nyc-dev