diff --git a/local-cli/bundle/buildBundle.js b/local-cli/bundle/buildBundle.js
index 32382287f316a6..5f0119e489ef9c 100644
--- a/local-cli/bundle/buildBundle.js
+++ b/local-cli/bundle/buildBundle.js
@@ -29,25 +29,27 @@ const TerminalReporter = require('metro/src/lib/TerminalReporter');
  * run Flow. */
 const TransformCaching = require('metro/src/lib/TransformCaching');
 
+const {defaults} = require('metro');
 /* $FlowFixMe(>=0.54.0 site=react_native_oss) This comment suppresses an error
  * found when Flow v0.54 was deployed. To see the error delete this comment and
  * run Flow. */
 const outputBundle = require('metro/src/shared/output/bundle');
 const path = require('path');
 const saveAssets = require('./saveAssets');
-const defaultAssetExts = require('metro/src/defaults').assetExts;
-const defaultSourceExts = require('metro/src/defaults').sourceExts;
-const defaultPlatforms = require('metro/src/defaults').platforms;
-/* $FlowFixMe(>=0.54.0 site=react_native_oss) This comment suppresses an error
- * found when Flow v0.54 was deployed. To see the error delete this comment and
- * run Flow. */
-const defaultProvidesModuleNodeModules = require('metro/src/defaults').providesModuleNodeModules;
 
 const {ASSET_REGISTRY_PATH} = require('../core/Constants');
 
 import type {RequestOptions, OutputOptions} from './types.flow';
 import type {ConfigT} from 'metro';
 
+const defaultAssetExts = defaults.assetExts;
+const defaultSourceExts = defaults.sourceExts;
+const defaultPlatforms = defaults.platforms;
+/* $FlowFixMe(>=0.54.0 site=react_native_oss) This comment suppresses an error
+ * found when Flow v0.54 was deployed. To see the error delete this comment and
+ * run Flow. */
+const defaultProvidesModuleNodeModules = defaults.providesModuleNodeModules;
+
 async function buildBundle(
   args: OutputOptions & {
     assetsDest: mixed,
diff --git a/local-cli/server/runServer.js b/local-cli/server/runServer.js
index c7809b1c1893f3..66851c8cb43bb8 100644
--- a/local-cli/server/runServer.js
+++ b/local-cli/server/runServer.js
@@ -16,7 +16,7 @@ require('../../setupBabel')();
 /* $FlowFixMe(>=0.54.0 site=react_native_oss) This comment suppresses an error
  * found when Flow v0.54 was deployed. To see the error delete this comment and
  * run Flow. */
-const ReactPackager = require('metro');
+const Metro = require('metro');
 
 const HmrServer = require('metro/src/HmrServer');
 
@@ -31,14 +31,14 @@ const attachWebsocketServer = require('./util/attachWebsocketServer');
  * run Flow. */
 const connect = require('connect');
 const copyToClipBoardMiddleware = require('./middleware/copyToClipBoardMiddleware');
-const defaultAssetExts = require('metro/src/defaults').assetExts;
-const defaultSourceExts = require('metro/src/defaults').sourceExts;
-const defaultPlatforms = require('metro/src/defaults').platforms;
+const defaultAssetExts = Metro.defaults.assetExts;
+const defaultSourceExts = Metro.defaults.sourceExts;
+const defaultPlatforms = Metro.defaults.platforms;
 /* $FlowFixMe(>=0.54.0 site=react_native_oss) This comment suppresses an error
  * found when Flow v0.54 was deployed. To see the error delete this comment and
  * run Flow. */
-const defaultProvidesModuleNodeModules = require('metro/src/defaults')
-  .providesModuleNodeModules;
+const defaultProvidesModuleNodeModules =
+  Metro.defaults.providesModuleNodeModules;
 const fs = require('fs');
 const getDevToolsMiddleware = require('./middleware/getDevToolsMiddleware');
 const http = require('http');
@@ -178,7 +178,7 @@ function getPackagerServer(args, config, reporter) {
   const providesModuleNodeModules =
     args.providesModuleNodeModules || defaultProvidesModuleNodeModules;
 
-  return ReactPackager.createServer({
+  return Metro.createServer({
     assetExts: defaultAssetExts.concat(args.assetExts),
     assetRegistryPath: ASSET_REGISTRY_PATH,
     blacklistRE: config.getBlacklistRE(),