Remove the duplicate enable-query check