Revert "Serious bug in finding blocks?"

This reverts commit 04937aac193ac62abaab450a827eae6fca9f41a8.