diff --git a/config.js b/config.js
index 14dfc9e..45fc25e 100644
--- a/config.js
+++ b/config.js
@@ -3,10 +3,7 @@ const sander = require( 'sander' );
 
 exports.root = path.resolve( __dirname );
 exports.tmpdir = process.env.NOW ? `/tmp` : `${exports.root}/.tmp`;
-
-// TODO(sven): this is a workarround https://twitter.com/svensauleau/status/1035880023964766209
-// exports.registry = 'https://registry.npmjs.org';
-exports.registry = 'https://registry.yarnpkg.com';
+exports.registry = 'https://registry.npmjs.org';
 
 if ( !process.env.NOW ) {
 	try {
diff --git a/server/child-processes/create-bundle.js b/server/child-processes/create-bundle.js
index ed218f0..f34ee47 100644
--- a/server/child-processes/create-bundle.js
+++ b/server/child-processes/create-bundle.js
@@ -56,10 +56,7 @@ async function createBundle ({ hash, pkg, version, deep, query }) {
 }
 
 function fetchAndExtract ( pkg, version, dir ) {
-	let tarUrl = pkg.versions[ version ].dist.tarball;
-
-	// TODO(sven): this is a workarround https://twitter.com/svensauleau/status/1035880023964766209
-	tarUrl = tarUrl.replace("npmjs.org", "yarnpkg.com");
+	const tarUrl = pkg.versions[ version ].dist.tarball;
 
 	info( `[${pkg.name}] fetching ${tarUrl}` );