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

This reverts commit 9591265d2c81144e767ce9ccf2c5cdd2d9ab98f8.

Change-Id: I7e706aea174dda64b973f1deff309417e826959e
Merge "Revert "Avoid unecessary call to cassandra when using walk.""