Revert "Sometimes property service is slow to respond."

This reverts commit b206dea43ae01ad7c82c0674f5cbfd777f1aa885.

Change-Id: Idd50159d4767ecd89f741f225533f0b85ee1cd64