Revert pull request #30.

This is a commit that reverts pull request #30. This commit broke existing query-validator tests and needs to be reverted to keep all of test cases passing.