Revert changes to QueryBuilder.java