Roolback QueryBuilder changes

Roolback QueryBuilder change, clean change in #3399