Fix for #2500
Revert "Fix for #2500"

This reverts commit 259d473aeef9d330f417269f8492bd3317d1073b.
Removed short-circuit logic for reads in conflict resolving queue altogether
Merge branch 'v1.12.x' into next