diff --git a/packages/discord.js/package.json b/packages/discord.js/package.json
index d3964ddcc..26819d561 100644
--- a/packages/discord.js/package.json
+++ b/packages/discord.js/package.json
@@ -55,6 +55,7 @@
     "discord-api-types": "^0.31.1",
     "fast-deep-equal": "^3.1.3",
     "lodash.snakecase": "^4.1.1",
+    "tslib": "^2.3.1",
     "undici": "^4.14.1",
     "ws": "^8.5.0"
   },
diff --git a/packages/discord.js/src/index.js b/packages/discord.js/src/index.js
index c9aa4449e..c44e2af4d 100644
--- a/packages/discord.js/src/index.js
+++ b/packages/discord.js/src/index.js
@@ -1,5 +1,7 @@
 'use strict';
 
+const { __exportStar } = require('tslib');
+
 // "Root" classes (starting points)
 exports.BaseClient = require('./client/BaseClient');
 exports.Client = require('./client/Client');
@@ -205,12 +207,8 @@ exports.StickerFormatType = require('discord-api-types/v10').StickerFormatType;
 exports.TextInputStyle = require('discord-api-types/v10').TextInputStyle;
 exports.UserFlags = require('discord-api-types/v10').UserFlags;
 exports.WebhookType = require('discord-api-types/v10').WebhookType;
-exports.UnsafeButtonBuilder = require('@discordjs/builders').UnsafeButtonBuilder;
-exports.UnsafeEmbedBuilder = require('@discordjs/builders').UnsafeEmbedBuilder;
-exports.UnsafeSelectMenuBuilder = require('@discordjs/builders').UnsafeSelectMenuBuilder;
-exports.UnsafeSelectMenuOptionBuilder = require('@discordjs/builders').UnsafeSelectMenuOptionBuilder;
-exports.UnsafeModalBuilder = require('@discordjs/builders').UnsafeModalBuilder;
-exports.UnsafeTextInputBuilder = require('@discordjs/builders').UnsafeTextInputBuilder;
 exports.DiscordAPIError = require('@discordjs/rest').DiscordAPIError;
 exports.HTTPError = require('@discordjs/rest').HTTPError;
 exports.RateLimitError = require('@discordjs/rest').RateLimitError;
+
+__exportStar(require('@discordjs/builders'), exports);
diff --git a/packages/discord.js/src/util/Util.js b/packages/discord.js/src/util/Util.js
index 2572c67f1..4fbe704bf 100644
--- a/packages/discord.js/src/util/Util.js
+++ b/packages/discord.js/src/util/Util.js
@@ -246,9 +246,9 @@ class Util extends null {
    */
   static parseEmoji(text) {
     if (text.includes('%')) text = decodeURIComponent(text);
-    if (!text.includes(':')) return { animated: false, name: text, id: null };
+    if (!text.includes(':')) return { animated: false, name: text, id: undefined };
     const match = text.match(/<?(?:(a):)?(\w{2,32}):(\d{17,19})?>?/);
-    return match && { animated: Boolean(match[1]), name: match[2], id: match[3] ?? null };
+    return match && { animated: Boolean(match[1]), name: match[2], id: match[3] };
   }
 
   /**
diff --git a/packages/discord.js/typings/index.d.ts b/packages/discord.js/typings/index.d.ts
index 8a5ef2e2e..977cad0b5 100644
--- a/packages/discord.js/typings/index.d.ts
+++ b/packages/discord.js/typings/index.d.ts
@@ -5390,14 +5390,5 @@ export {
   UserFlags,
   WebhookType,
 } from 'discord-api-types/v10';
-export {
-  UnsafeEmbedBuilder,
-  UnsafeModalBuilder,
-  UnsafeTextInputBuilder,
-  UnsafeButtonBuilder,
-  UnsafeSelectMenuBuilder,
-  UnsafeSelectMenuOptionBuilder,
-  MessageActionRowComponentBuilder,
-  ModalActionRowComponentBuilder,
-} from '@discordjs/builders';
+export * from '@discordjs/builders';
 export { DiscordAPIError, HTTPError, RateLimitError } from '@discordjs/rest';
diff --git a/yarn.lock b/yarn.lock
index 55ba25078..addd825ed 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4460,6 +4460,7 @@ __metadata:
     lodash.snakecase: ^4.1.1
     prettier: ^2.5.1
     tsd: ^0.19.1
+    tslib: ^2.3.1
     tslint: ^6.1.3
     typescript: ^4.5.5
     undici: ^4.14.1