revert r34094 for now -- requires index that hasn't been deployed yet