Revert index clobbering change to see performance impact