diff --git a/frontend_tests/zjsunit/index.js b/frontend_tests/zjsunit/index.js
index f19b661e1a..78e61b464f 100644
--- a/frontend_tests/zjsunit/index.js
+++ b/frontend_tests/zjsunit/index.js
@@ -12,7 +12,7 @@ var path = require('path');
 var fs = require('fs');
 
 global.assert = require('assert');
-require('string.prototype.codepointat/codepointat.js');
+require('core-js/features/string/code-point-at');
 
 global._ = require('underscore/underscore.js');
 var _ = global._;
diff --git a/package.json b/package.json
index b4b0625fb5..fdf67a4cff 100644
--- a/package.json
+++ b/package.json
@@ -12,6 +12,7 @@
     "blueimp-md5": "2.10.0",
     "cache-loader": "4.0.0",
     "clipboard": "2.0.4",
+    "core-js": "^3.0.1",
     "css-loader": "2.1.1",
     "emoji-datasource-google": "4.0.4",
     "emoji-datasource-google-blob": "npm:emoji-datasource-google@3.0.0",
@@ -42,9 +43,6 @@
     "sortablejs": "1.9.0",
     "sorttable": "1.0.2",
     "source-sans-pro": "2.45.0",
-    "string.prototype.codepointat": "0.2.1",
-    "string.prototype.endswith": "0.2.0",
-    "string.prototype.startswith": "0.2.0",
     "style-loader": "0.23.1",
     "to-markdown": "3.1.0",
     "ts-loader": "6.0.2",
diff --git a/static/js/bundles/app.js b/static/js/bundles/app.js
index e9c164c8f8..9f7c9cf230 100644
--- a/static/js/bundles/app.js
+++ b/static/js/bundles/app.js
@@ -14,7 +14,7 @@ import "xdate/src/xdate.js";
 import "jquery-validation/dist/jquery.validate.js";
 import "blueimp-md5/js/md5.js";
 import "clipboard/dist/clipboard.js";
-import "string.prototype.codepointat/codepointat.js";
+import "core-js/features/string/code-point-at";
 import "winchan/winchan.js";
 import "handlebars/dist/cjs/handlebars.runtime.js";
 import "to-markdown/dist/to-markdown.js";
diff --git a/static/js/bundles/commons.js b/static/js/bundles/commons.js
index cfa7c35f9e..be716d7c9a 100644
--- a/static/js/bundles/commons.js
+++ b/static/js/bundles/commons.js
@@ -1,6 +1,6 @@
-import "string.prototype.endswith";
-import "string.prototype.startswith";
-import "string.prototype.codepointat";
+import "core-js/features/string/ends-with";
+import "core-js/features/string/starts-with";
+import "core-js/features/string/code-point-at";
 import "jquery/dist/jquery.js";
 import "underscore/underscore.js";
 import "../csrf.js";
diff --git a/version.py b/version.py
index 341a35c480..1574dd7d88 100644
--- a/version.py
+++ b/version.py
@@ -21,4 +21,4 @@ LATEST_RELEASE_ANNOUNCEMENT = "https://blog.zulip.org/2019/03/01/zulip-2-0-relea
 # Typically, adding a dependency only requires a minor version bump, and
 # removing a dependency requires a major version bump.
 
-PROVISION_VERSION = '35.4'
+PROVISION_VERSION = '36.0'
diff --git a/yarn.lock b/yarn.lock
index 6d3d6405e9..e41a1d79de 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9943,21 +9943,11 @@ string.fromcodepoint@^0.2.1:
   resolved "https://registry.yarnpkg.com/string.fromcodepoint/-/string.fromcodepoint-0.2.1.tgz#8d978333c0bc92538f50f383e4888f3e5619d653"
   integrity sha1-jZeDM8C8klOPUPOD5IiPPlYZ1lM=
 
-string.prototype.codepointat@0.2.1, string.prototype.codepointat@^0.2.0:
+string.prototype.codepointat@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/string.prototype.codepointat/-/string.prototype.codepointat-0.2.1.tgz#004ad44c8afc727527b108cd462b4d971cd469bc"
   integrity sha512-2cBVCj6I4IOvEnjgO/hWqXjqBGsY+zwPmHl12Srk9IXSZ56Jwwmy+66XO5Iut/oQVR7t5ihYdLB0GMa4alEUcg==
 
-string.prototype.endswith@0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/string.prototype.endswith/-/string.prototype.endswith-0.2.0.tgz#a19c20dee51a98777e9a47e10f09be393b9bba75"
-  integrity sha1-oZwg3uUamHd+mkfhDwm+OTubunU=
-
-string.prototype.startswith@0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/string.prototype.startswith/-/string.prototype.startswith-0.2.0.tgz#da68982e353a4e9ac4a43b450a2045d1c445ae7b"
-  integrity sha1-2miYLjU6TprEpDtFCiBF0cRFrns=
-
 string.prototype.trim@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.1.2.tgz#d04de2c89e137f4d7d206f086b5ed2fae6be8cea"