Revert "Avoid unecessary call to cassandra when using walk."

This reverts commit b3a71b9a4523a007d4366dee8b64fef91ddb4615.

Change-Id: Ic71080652cba67bcc5a3f02b9e65258567ed6c5a
Merge "Revert "Avoid unecessary call to cassandra when using walk."" into R1.06