Revert "You guys can test the query later"

This reverts commit 0b72946902100e12d68851b499d43bfa343c147d.