Revert "2d query build problem fix"

This reverts commit 265c62ef46970fb38b64d53e58be7f82df6fad1e.