More closely follow the example of REINDEX