MODE-1863 - Removed unnecessary computations when re-indexing is disabled.