Revert "optimize search by materializing protobuf on the fly"

This reverts commit cb02829f9a27a18a40b0155dde0a9977efb328b4.
minor optimization