diff --git a/Zend/tests/pattern_matching/is/underscore_bc.phpt b/Zend/tests/pattern_matching/is/underscore_bc.phpt
deleted file mode 100644
index 78cbe4b801b72..0000000000000
--- a/Zend/tests/pattern_matching/is/underscore_bc.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-_ can still be a function name
---FILE--
-<?php
-
-// Avoid clash with _ in gettext
-namespace Foo;
-
-function _() {
-    echo "Done\n";
-}
-
-_();
-_ ();
-
-?>
---EXPECT--
-Done
-Done
diff --git a/Zend/tests/pattern_matching/is/wildcard.phpt b/Zend/tests/pattern_matching/is/wildcard.phpt
index 5af990c780bce..0cb473e725f34 100644
--- a/Zend/tests/pattern_matching/is/wildcard.phpt
+++ b/Zend/tests/pattern_matching/is/wildcard.phpt
@@ -5,13 +5,13 @@ Wildcard pattern matching
 
 class Foo {}
 
-var_dump('' is _);
-var_dump(42 is _);
-var_dump(3.141 is _);
-var_dump(null is _);
-var_dump(true is _);
-var_dump(new Foo() is _);
-var_dump([1, 2, 3] is _);
+var_dump('' is *);
+var_dump(42 is *);
+var_dump(3.141 is *);
+var_dump(null is *);
+var_dump(true is *);
+var_dump(new Foo() is *);
+var_dump([1, 2, 3] is *);
 
 ?>
 --EXPECT--
diff --git a/Zend/tests/pattern_matching/match/basic.phpt b/Zend/tests/pattern_matching/match/basic.phpt
index 499de581bf761..0d264abf59937 100644
--- a/Zend/tests/pattern_matching/match/basic.phpt
+++ b/Zend/tests/pattern_matching/match/basic.phpt
@@ -55,7 +55,7 @@ var_dump(match ('Foo') {
     is 1 => wrong(),
     is 2 => wrong(),
     is 3 => wrong(),
-    is _ => 'Wildcard pattern',
+    is * => 'Wildcard pattern',
 });
 
 var_dump(match (15) {
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
index fc332e49f6ba9..e9f8e9b2738ad 100644
--- a/Zend/zend_language_parser.y
+++ b/Zend/zend_language_parser.y
@@ -136,7 +136,6 @@ static YYSIZE_T zend_yytnamerr(char*, const char*);
 %token <ident> T_DEFAULT       "'default'"
 %token <ident> T_MATCH         "'match'"
 %token <ident> T_IS            "'is'"
-%token <ident> T_UNDERSCORE    "'_'"
 %token <ident> T_BREAK         "'break'"
 %token <ident> T_CONTINUE      "'continue'"
 %token <ident> T_GOTO          "'goto'"
@@ -312,7 +311,7 @@ reserved_non_modifiers:
 	| T_FUNCTION | T_CONST | T_RETURN | T_PRINT | T_YIELD | T_LIST | T_SWITCH | T_ENDSWITCH | T_CASE | T_DEFAULT | T_BREAK
 	| T_ARRAY | T_CALLABLE | T_EXTENDS | T_IMPLEMENTS | T_NAMESPACE | T_TRAIT | T_INTERFACE | T_CLASS
 	| T_CLASS_C | T_TRAIT_C | T_FUNC_C | T_METHOD_C | T_LINE | T_FILE | T_DIR | T_NS_C | T_FN | T_MATCH | T_ENUM
-	| T_UNDERSCORE | T_IS
+	| T_IS
 ;
 
 semi_reserved:
@@ -1298,7 +1297,7 @@ atomic_pattern:
 	|	array_pattern { $$ = $1; }
 	|	binding_pattern { $$ = $1; }
 	|	class_const_pattern { $$ = $1; }
-	|	T_UNDERSCORE { $$ = zend_ast_create(ZEND_AST_WILDCARD_PATTERN); }
+	|	'*' { $$ = zend_ast_create(ZEND_AST_WILDCARD_PATTERN); }
 	|	'(' pattern ')' {
 			$$ = $2;
 			if ($$->kind == ZEND_AST_OR_PATTERN || $$->kind == ZEND_AST_AND_PATTERN) {
diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l
index 3e12ec1f1faba..ba2362c31b474 100644
--- a/Zend/zend_language_scanner.l
+++ b/Zend/zend_language_scanner.l
@@ -1509,14 +1509,6 @@ OPTIONAL_WHITESPACE_OR_COMMENTS ({WHITESPACE}|{MULTI_LINE_COMMENT}|{SINGLE_LINE_
 	RETURN_TOKEN_WITH_IDENT(T_IS);
 }
 
-<ST_IN_SCRIPTING>"_"[ \t\r\n]*"(" {
-	yyless(1);
-	RETURN_TOKEN_WITH_STR(T_STRING, 0);
-}
-<ST_IN_SCRIPTING>"_" {
-	RETURN_TOKEN_WITH_IDENT(T_UNDERSCORE);
-}
-
 <ST_IN_SCRIPTING>"endswitch" {
 	RETURN_TOKEN_WITH_IDENT(T_ENDSWITCH);
 }
diff --git a/ext/tokenizer/tokenizer_data.c b/ext/tokenizer/tokenizer_data.c
index 10537b5c92a6c..1bc03feb42362 100644
--- a/ext/tokenizer/tokenizer_data.c
+++ b/ext/tokenizer/tokenizer_data.c
@@ -73,7 +73,6 @@ char *get_token_type_name(int token_type)
 		case T_DEFAULT: return "T_DEFAULT";
 		case T_MATCH: return "T_MATCH";
 		case T_IS: return "T_IS";
-		case T_UNDERSCORE: return "T_UNDERSCORE";
 		case T_BREAK: return "T_BREAK";
 		case T_CONTINUE: return "T_CONTINUE";
 		case T_GOTO: return "T_GOTO";
diff --git a/ext/tokenizer/tokenizer_data.stub.php b/ext/tokenizer/tokenizer_data.stub.php
index 3b663b1b917d9..732d8d530ffc1 100644
--- a/ext/tokenizer/tokenizer_data.stub.php
+++ b/ext/tokenizer/tokenizer_data.stub.php
@@ -242,11 +242,6 @@
  * @cvalue T_IS
  */
 const T_IS = UNKNOWN;
-/**
- * @var int
- * @cvalue T_UNDERSCORE
- */
-const T_UNDERSCORE = UNKNOWN;
 /**
  * @var int
  * @cvalue T_BREAK
diff --git a/ext/tokenizer/tokenizer_data_arginfo.h b/ext/tokenizer/tokenizer_data_arginfo.h
index 63c12e82743f2..7c0ce84d58994 100644
--- a/ext/tokenizer/tokenizer_data_arginfo.h
+++ b/ext/tokenizer/tokenizer_data_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 03cae24ee5e50580a6e151d9bb10be6038770cb2 */
+ * Stub hash: 9b464ad0f4bb93443c77cb4892ec8d85ae240961 */
 
 static void register_tokenizer_data_symbols(int module_number)
 {
@@ -51,7 +51,6 @@ static void register_tokenizer_data_symbols(int module_number)
 	REGISTER_LONG_CONSTANT("T_DEFAULT", T_DEFAULT, CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("T_MATCH", T_MATCH, CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("T_IS", T_IS, CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("T_UNDERSCORE", T_UNDERSCORE, CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("T_BREAK", T_BREAK, CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("T_CONTINUE", T_CONTINUE, CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("T_GOTO", T_GOTO, CONST_PERSISTENT);