That code can cause the whole scanning process to stop on large collections, so disabling it for now.

This reverts commit 081ab075bf6bebc5f8e07ea6bf570d66e6964fb7.
Bumped revision
Merge branch 'master' into sdk5100