5 files changed, 4 insertions, 39 deletions
diff --git a/hugolib/language_test.go b/hugolib/language_test.go
index 582d3985f..f7dd5b79d 100644
--- a/hugolib/language_test.go
+++ b/hugolib/language_test.go
@@ -104,8 +104,7 @@ FormatCurrency: {{ 512.5032 | lang.FormatCurrency 2 "USD" }}
 FormatAccounting: {{ 512.5032 | lang.FormatAccounting 2 "NOK" }}
 FormatNumberCustom: {{ lang.FormatNumberCustom 2 12345.6789 }}
 
-# We renamed this to FormatNumberCustom in 0.87.0.
-NumFmt: {{ -98765.4321 | lang.NumFmt 2 }}
+
 
 	
 `)
@@ -120,7 +119,6 @@ FormatCurrency: $512.50
 FormatAccounting: NOK512.50
 FormatNumberCustom: 12,345.68
         
-NumFmt: -98,765.43
 `,
 	)
 
@@ -131,8 +129,6 @@ FormatCurrency: 512,50 USD
 FormatAccounting: 512,50 kr
 FormatNumberCustom: 12,345.68
 
-# We renamed this to FormatNumberCustom in 0.87.0.
-NumFmt: -98,765.43
 `)
 }
 
diff --git a/testscripts/commands/hugo.txt b/testscripts/commands/hugo.txt
index 60f7ffe71..bf0f5cf0d 100644
--- a/testscripts/commands/hugo.txt
+++ b/testscripts/commands/hugo.txt
@@ -11,7 +11,7 @@ grep 'IsServer: false;IsProduction: true'  public/index.html
 baseURL = "http://example.org/"
 disableKinds = ["RSS", "sitemap", "robotsTXT", "404", "taxonomy", "term"]
 -- layouts/index.html --
-Home|IsServer: {{ .Site.IsServer }};IsProduction: {{ hugo.IsProduction }}|
+Home|IsServer: {{ hugo.IsServer }};IsProduction: {{ hugo.IsProduction }}|
 -- layouts/_default/single.html --
 Title: {{ .Title }}
 -- content/p1.md --
diff --git a/testscripts/commands/server.txt b/testscripts/commands/server.txt
index a28e4d698..7f6afd8fd 100644
--- a/testscripts/commands/server.txt
+++ b/testscripts/commands/server.txt
@@ -25,7 +25,7 @@ myenv = "theproduction"
 myenv = "thedevelopment"
 -- layouts/index.html --
 <body>
-Title: {{ .Title }}|BaseURL: {{ site.BaseURL }}|ServerPort: {{ site.ServerPort }}|myenv: {{ .Site.Params.myenv }}|Env: {{ hugo.Environment }}|IsServer: {{ site.IsServer }}|
+Title: {{ .Title }}|BaseURL: {{ site.BaseURL }}|ServerPort: {{ site.ServerPort }}|myenv: {{ .Site.Params.myenv }}|Env: {{ hugo.Environment }}|IsServer: {{ hugo.IsServer }}|
 </body>
 -- layouts/404.html --
 custom 404
diff --git a/tpl/collections/collections_integration_test.go b/tpl/collections/collections_integration_test.go
index 3bcd4effb..e39493b52 100644
--- a/tpl/collections/collections_integration_test.go
+++ b/tpl/collections/collections_integration_test.go
@@ -202,35 +202,6 @@ foo: bc
 	b.AssertFileContent("public/index.html", "<ul><li>P1</li><li>P2</li></ul>")
 }
 
-// Issue #11498
-func TestEchoParams(t *testing.T) {
-	t.Parallel()
-	files := `
--- hugo.toml --
-[params.footer]
-string = 'foo'
-int = 42
-float = 3.1415
-boolt = true
-boolf = false
--- layouts/index.html --
-{{ echoParam .Site.Params.footer "string" }}
-{{ echoParam .Site.Params.footer "int" }}
-{{ echoParam .Site.Params.footer "float" }}
-{{ echoParam .Site.Params.footer "boolt" }}
-{{ echoParam .Site.Params.footer "boolf" }}
-	`
-
-	b := hugolib.Test(t, files)
-	b.AssertFileContent("public/index.html",
-		"foo",
-		"42",
-		"3.1415",
-		"true",
-		"false",
-	)
-}
-
 func TestTermEntriesCollectionsIssue12254(t *testing.T) {
 	t.Parallel()
 
diff --git a/tpl/collections/init.go b/tpl/collections/init.go
index 8801422ac..20711f9e4 100644
--- a/tpl/collections/init.go
+++ b/tpl/collections/init.go
@@ -69,9 +69,7 @@ func init() {
 
 		ns.AddMethodMapping(ctx.EchoParam,
 			[]string{"echoParam"},
-			[][2]string{
-				{`{{ echoParam .Params "langCode" }}`, `en`},
-			},
+			[][2]string{},
 		)
 
 		ns.AddMethodMapping(ctx.First,