diff --git a/.gitmodules b/.gitmodules
index 3bedd29a..315e5065 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -118,9 +118,6 @@
 [submodule "vendor/grammars/cucumber-tmbundle"]
 	path = vendor/grammars/cucumber-tmbundle
 	url = https://github.com/cucumber/cucumber-tmbundle
-[submodule "vendor/grammars/Handlebars"]
-	path = vendor/grammars/Handlebars
-	url = https://github.com/daaain/Handlebars
 [submodule "vendor/grammars/powershell"]
 	path = vendor/grammars/powershell
 	url = https://github.com/SublimeText/PowerShell
diff --git a/grammars.yml b/grammars.yml
index b78010d6..a1250b5b 100644
--- a/grammars.yml
+++ b/grammars.yml
@@ -50,8 +50,6 @@ vendor/grammars/G-Code/:
 - source.gcode
 vendor/grammars/GDScript-sublime/:
 - source.gdscript
-vendor/grammars/Handlebars:
-- text.html.handlebars
 vendor/grammars/IDL-Syntax:
 - source.webidl
 vendor/grammars/InnoSetup/:
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index e2c82ab8..c62f57d6 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -1319,7 +1319,7 @@ Handlebars:
   extensions:
   - .handlebars
   - .hbs
-  tm_scope: text.html.handlebars
+  tm_scope: none
   ace_mode: handlebars
 
 Harbour:
diff --git a/vendor/grammars/Handlebars b/vendor/grammars/Handlebars
deleted file mode 160000
index 35d82156..00000000
--- a/vendor/grammars/Handlebars
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 35d821569d562403af8b85a4e8d9acc841656b41