diff --git a/angular/src/app-initialize.ts b/angular/src/app-initialize.ts
index ddc2806685..1bfbc2cd23 100644
--- a/angular/src/app-initialize.ts
+++ b/angular/src/app-initialize.ts
@@ -1,4 +1,4 @@
-import * as c from '@ionic/core/loader';
+import { defineCustomElements } from '@ionic/core/loader';
 import { Config } from './providers/config';
 import { IonicWindow } from './types/interfaces';
 
@@ -31,105 +31,9 @@ export function appInitialize(config: Config) {
           elm.removeEventListener(eventName, cb, opts);
         }
       };
-
-      c.defineCustomElement(win, [
-        c.IonActionSheet,
-        c.IonActionSheetController,
-        c.IonAlert,
-        c.IonAlertController,
-        c.IonAnchor,
-        c.IonAnimationController,
-        c.IonApp,
-        c.IonAvatar,
-        c.IonBackButton,
-        c.IonBackdrop,
-        c.IonBadge,
-        c.IonButton,
-        c.IonButtons,
-        c.IonCard,
-        c.IonCardContent,
-        c.IonCardHeader,
-        c.IonCardSubtitle,
-        c.IonCardTitle,
-        c.IonCheckbox,
-        c.IonChip,
-        c.IonCol,
-        c.IonContent,
-        c.IonDatetime,
-        c.IonFab,
-        c.IonFabButton,
-        c.IonFabList,
-        c.IonFooter,
-        c.IonGrid,
-        c.IonHeader,
-        c.IonIcon,
-        c.IonImg,
-        c.IonInfiniteScroll,
-        c.IonInfiniteScrollContent,
-        c.IonInput,
-        c.IonItem,
-        c.IonItemDivider,
-        c.IonItemGroup,
-        c.IonItemOption,
-        c.IonItemOptions,
-        c.IonItemSliding,
-        c.IonLabel,
-        c.IonList,
-        c.IonListHeader,
-        c.IonLoading,
-        c.IonLoadingController,
-        c.IonMenu,
-        c.IonMenuButton,
-        c.IonMenuController,
-        c.IonMenuToggle,
-        c.IonModal,
-        c.IonModalController,
-        c.IonNav,
-        c.IonNavPop,
-        c.IonNavPush,
-        c.IonNavSetRoot,
-        c.IonNote,
-        c.IonPicker,
-        c.IonPickerColumn,
-        c.IonPickerController,
-        c.IonPopover,
-        c.IonPopoverController,
-        c.IonRadio,
-        c.IonRadioGroup,
-        c.IonRange,
-        c.IonRefresher,
-        c.IonRefresherContent,
-        c.IonReorder,
-        c.IonReorderGroup,
-        c.IonRippleEffect,
-        c.IonRoute,
-        c.IonRouteRedirect,
-        c.IonRouter,
-        c.IonRouterOutlet,
-        c.IonRow,
-        c.IonSearchbar,
-        c.IonSegment,
-        c.IonSegmentButton,
-        c.IonSelect,
-        c.IonSelectOption,
-        c.IonSelectPopover,
-        c.IonSkeletonText,
-        c.IonSlide,
-        c.IonSlides,
-        c.IonSpinner,
-        c.IonSplitPane,
-        c.IonTabBar,
-        c.IonTabButton,
-        c.IonText,
-        c.IonTextarea,
-        c.IonThumbnail,
-        c.IonTitle,
-        c.IonToast,
-        c.IonToastController,
-        c.IonToggle,
-        c.IonToolbar,
-        c.IonVirtualScroll
-      ]);
+      defineCustomElements(win, {
+        exclude: ['ion-tabs', 'ion-tab']
+      });
     }
   };
 }
diff --git a/core/package.json b/core/package.json
index 24d3363cb4..cff25f4254 100644
--- a/core/package.json
+++ b/core/package.json
@@ -29,7 +29,7 @@
     "ionicons": "4.4.8"
   },
   "devDependencies": {
-    "@stencil/core": "0.16.1-3",
+    "@stencil/core": "0.16.1-4",
     "@stencil/sass": "0.1.1",
     "@stencil/utils": "latest",
     "@types/jest": "^23.3.1",