Revert change to make index settings sometimes use custom data_path