Revert "Implementation work on QueryEntityDeserializer"

This reverts commit 9ba6aa26b88d446c4e2c6a24a9c5aacbc2b72ce1.

Breaks the build..

Change-Id: I2759acd74a00d5448bbe6df2b7b69b3624de86e4