For 4.3.1: Revert CQ shared store: Delete from index on remove or roll over (#13959) (backport #16142)
#16195
+18
−50