diff --git a/wp-includes/taxonomy.php b/wp-includes/taxonomy.php
index 534a9de4f1..47633d1f02 100644
--- a/wp-includes/taxonomy.php
+++ b/wp-includes/taxonomy.php
@@ -1209,7 +1209,7 @@ function get_terms( $args = array(), $deprecated = '' ) {
 	$terms = $term_query->query( $args );
 
 	// Count queries are not filtered, for legacy reasons.
-	if ( $term_query->query_vars['count'] ) {
+	if ( ! is_array( $terms ) ) {
 		return $terms;
 	}
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 7cccedd16e..52fa6d1ff7 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.6-alpha-37633';
+$wp_version = '4.6-alpha-37634';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.