diff -Nru eclipse-platform-runtime-4.7.3/debian/build.xml eclipse-platform-runtime-4.7.3/debian/build.xml
--- eclipse-platform-runtime-4.7.3/debian/build.xml	2018-09-23 02:43:22.000000000 +0000
+++ eclipse-platform-runtime-4.7.3/debian/build.xml	2018-09-24 14:09:30.000000000 +0000
@@ -46,4 +46,50 @@
     </make-bundle>
   </target>
 
+  <!-- Eclipse Contexts -->
+  <target name="org.eclipse.e4.core.contexts" depends="org.eclipse.e4.core.di">
+    <make-bundle name="org.eclipse.e4.core.contexts" depends="org.eclipse.e4.core.di">
+      <pathelement path="/usr/share/java/atinject-jsr330-api.jar"/>
+      <pathelement path="/usr/share/java/eclipse-osgi-services.jar"/>
+    </make-bundle>
+  </target>
+
+  <!-- Eclipse Dependency Injection -->
+  <target name="org.eclipse.e4.core.di" depends="org.eclipse.e4.core.di.annotations">
+    <make-bundle name="org.eclipse.e4.core.di" depends="org.eclipse.e4.core.di.annotations">
+      <pathelement path="/usr/share/java/atinject-jsr330-api.jar"/>
+    </make-bundle>
+  </target>
+
+  <!-- Eclipse Dependency Injection Annotations -->
+  <target name="org.eclipse.e4.core.di.annotations">
+    <make-bundle name="org.eclipse.e4.core.di.annotations">
+      <pathelement path="/usr/share/java/atinject-jsr330-api.jar"/>
+    </make-bundle>
+  </target>
+
+  <!-- Eclipse Dependency Injection Extensions -->
+  <target name="org.eclipse.e4.core.di.extensions">
+    <make-bundle name="org.eclipse.e4.core.di.extensions">
+      <pathelement path="/usr/share/java/atinject-jsr330-api.jar"/>
+    </make-bundle>
+  </target>
+
+  <!-- Eclipse Dependency Injection Extensions Supplier -->
+  <target name="org.eclipse.e4.core.di.extensions.supplier" depends="org.eclipse.e4.core.contexts,org.eclipse.e4.core.di,org.eclipse.e4.core.di.annotations,org.eclipse.e4.core.di.extensions">
+    <make-bundle name="org.eclipse.e4.core.di.extensions.supplier" depends="org.eclipse.e4.core.contexts,org.eclipse.e4.core.di,org.eclipse.e4.core.di.annotations,org.eclipse.e4.core.di.extensions">
+      <pathelement path="/usr/share/java/eclipse-osgi-services.jar"/>
+      <pathelement path="/usr/share/java/equinox-preferences.jar"/>
+    </make-bundle>
+  </target>
+
+  <!-- Eclipse Application Services -->
+  <target name="org.eclipse.e4.core.services" depends="org.eclipse.e4.core.contexts,org.eclipse.e4.core.di,org.eclipse.e4.core.di.annotations">
+    <make-bundle name="org.eclipse.e4.core.services" depends="org.eclipse.e4.core.contexts,org.eclipse.e4.core.di,org.eclipse.e4.core.di.annotations">
+      <pathelement path="/usr/share/java/atinject-jsr330-api.jar"/>
+      <pathelement path="/usr/share/java/equinox-common.jar"/>
+      <pathelement path="/usr/share/java/eclipse-osgi-services.jar"/>
+    </make-bundle>
+  </target>
+
 </project>
diff -Nru eclipse-platform-runtime-4.7.3/debian/bundles eclipse-platform-runtime-4.7.3/debian/bundles
--- eclipse-platform-runtime-4.7.3/debian/bundles	2018-09-23 02:43:22.000000000 +0000
+++ eclipse-platform-runtime-4.7.3/debian/bundles	2018-09-24 14:09:30.000000000 +0000
@@ -1,5 +1,11 @@
-#org.eclipse.core.contenttype
-#org.eclipse.core.expressions
+org.eclipse.core.contenttype
+org.eclipse.core.expressions
 org.eclipse.core.jobs
-#org.eclipse.core.runtime
+org.eclipse.core.runtime
 #org.eclipse.core.tools
+org.eclipse.e4.core.contexts
+org.eclipse.e4.core.di
+org.eclipse.e4.core.di.annotations
+org.eclipse.e4.core.di.extensions
+org.eclipse.e4.core.di.extensions.supplier
+org.eclipse.e4.core.services
diff -Nru eclipse-platform-runtime-4.7.3/debian/changelog eclipse-platform-runtime-4.7.3/debian/changelog
--- eclipse-platform-runtime-4.7.3/debian/changelog	2018-09-23 02:43:22.000000000 +0000
+++ eclipse-platform-runtime-4.7.3/debian/changelog	2018-09-24 14:09:30.000000000 +0000
@@ -1,3 +1,9 @@
+eclipse-platform-runtime (4.7.3-2build2) cosmic; urgency=medium
+
+  * Revert to Debian packaging after bootstrap completed
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Mon, 24 Sep 2018 10:09:30 -0400
+
 eclipse-platform-runtime (4.7.3-2build1) cosmic; urgency=medium
 
   * Bootstrap by basically reverting to the 4.7.3-1 version
diff -Nru eclipse-platform-runtime-4.7.3/debian/control eclipse-platform-runtime-4.7.3/debian/control
--- eclipse-platform-runtime-4.7.3/debian/control	2018-09-23 02:43:22.000000000 +0000
+++ eclipse-platform-runtime-4.7.3/debian/control	2018-09-24 14:09:30.000000000 +0000
@@ -6,11 +6,13 @@
 Build-Depends:
  debhelper (>= 11~),
  default-jdk,
- libequinox-osgi-java,
-# libequinox-app-java,
+ libatinject-jsr330-api-java,
+ libeclipse-osgi-java,
+ libeclipse-osgi-services-java,
+ libequinox-app-java,
  libequinox-common-java,
-# libequinox-preferences-java,
-# libequinox-registry-java,
+ libequinox-preferences-java,
+ libequinox-registry-java,
  libswt-gtk-4-java,
  eclipse-debian-helper
 Standards-Version: 4.2.1
@@ -30,41 +32,41 @@
  .
  This package contains the org.eclipse.core.jobs bundle.
 
-#Package: libeclipse-core-contenttype-java
-#Architecture: all
-#Depends: ${misc:Depends}, ${bundle-Depends}
-#Description: Eclipse Content Mechanism
-# Eclipse Platform defines the set of frameworks and common services that
-# collectively make up infrastructure required to support the use of Eclipse
-# as a component model, as a Rich Client Platform (RCP) and as a comprehensive
-# tool integration platform. The core component provides basic platform
-# infrastructure that does not involve any UI.
-# .
-# This package contains the org.eclipse.core.contenttype bundle.
+Package: libeclipse-core-contenttype-java
+Architecture: all
+Depends: ${misc:Depends}, ${bundle-Depends}
+Description: Eclipse Content Mechanism
+ Eclipse Platform defines the set of frameworks and common services that
+ collectively make up infrastructure required to support the use of Eclipse
+ as a component model, as a Rich Client Platform (RCP) and as a comprehensive
+ tool integration platform. The core component provides basic platform
+ infrastructure that does not involve any UI.
+ .
+ This package contains the org.eclipse.core.contenttype bundle.
 
-#Package: libeclipse-core-runtime-java
-#Architecture: all
-#Depends: ${misc:Depends}, ${bundle-Depends}
-#Description: Eclipse Core Runtime
-# Eclipse Platform defines the set of frameworks and common services that
-# collectively make up infrastructure required to support the use of Eclipse
-# as a component model, as a Rich Client Platform (RCP) and as a comprehensive
-# tool integration platform. The core component provides basic platform
-# infrastructure that does not involve any UI.
-# .
-# This package contains the org.eclipse.core.runtime bundle.
+Package: libeclipse-core-runtime-java
+Architecture: all
+Depends: ${misc:Depends}, ${bundle-Depends}
+Description: Eclipse Core Runtime
+ Eclipse Platform defines the set of frameworks and common services that
+ collectively make up infrastructure required to support the use of Eclipse
+ as a component model, as a Rich Client Platform (RCP) and as a comprehensive
+ tool integration platform. The core component provides basic platform
+ infrastructure that does not involve any UI.
+ .
+ This package contains the org.eclipse.core.runtime bundle.
 
-#Package: libeclipse-core-expressions-java
-#Architecture: all
-#Depends: ${misc:Depends}, ${bundle-Depends}, libequinox-common-java, libequinox-preferences-java, libequinox-registry-java
-#Description: Eclipse Expression Language
-# Eclipse Platform defines the set of frameworks and common services that
-# collectively make up infrastructure required to support the use of Eclipse
-# as a component model, as a Rich Client Platform (RCP) and as a comprehensive
-# tool integration platform. The core component provides basic platform
-# infrastructure that does not involve any UI.
-# .
-# This package contains the org.eclipse.core.expressions bundle.
+Package: libeclipse-core-expressions-java
+Architecture: all
+Depends: ${misc:Depends}, ${bundle-Depends}, libequinox-common-java, libequinox-preferences-java, libequinox-registry-java
+Description: Eclipse Expression Language
+ Eclipse Platform defines the set of frameworks and common services that
+ collectively make up infrastructure required to support the use of Eclipse
+ as a component model, as a Rich Client Platform (RCP) and as a comprehensive
+ tool integration platform. The core component provides basic platform
+ infrastructure that does not involve any UI.
+ .
+ This package contains the org.eclipse.core.expressions bundle.
 
 #Package: libeclipse-core-tools-java
 #Architecture: all
@@ -77,3 +79,76 @@
 # infrastructure that does not involve any UI.
 # .
 # This package contains the org.eclipse.core.tools bundle.
+
+
+Package: libeclipse-e4-core-contexts-java
+Architecture: all
+Depends: ${misc:Depends}, ${bundle-Depends}, libatinject-jsr330-api-java, libeclipse-osgi-services-java
+Description: Eclipse Contexts
+ Eclipse Platform defines the set of frameworks and common services that
+ collectively make up infrastructure required to support the use of Eclipse
+ as a component model, as a Rich Client Platform (RCP) and as a comprehensive
+ tool integration platform. The core component provides basic platform
+ infrastructure that does not involve any UI.
+ .
+ This package contains the org.eclipse.e4.core.contexts bundle.
+
+Package: libeclipse-e4-core-di-java
+Architecture: all
+Depends: ${misc:Depends}, ${bundle-Depends}, libatinject-jsr330-api-java
+Description: Eclipse Dependency Injection
+ Eclipse Platform defines the set of frameworks and common services that
+ collectively make up infrastructure required to support the use of Eclipse
+ as a component model, as a Rich Client Platform (RCP) and as a comprehensive
+ tool integration platform. The core component provides basic platform
+ infrastructure that does not involve any UI.
+ .
+ This package contains the org.eclipse.e4.core.di bundle.
+
+Package: libeclipse-e4-core-di-annotations-java
+Architecture: all
+Depends: ${misc:Depends}, ${bundle-Depends}, libatinject-jsr330-api-java
+Description: Eclipse Dependency Injection Annotations
+ Eclipse Platform defines the set of frameworks and common services that
+ collectively make up infrastructure required to support the use of Eclipse
+ as a component model, as a Rich Client Platform (RCP) and as a comprehensive
+ tool integration platform. The core component provides basic platform
+ infrastructure that does not involve any UI.
+ .
+ This package contains the org.eclipse.e4.core.di.annotations bundle.
+
+Package: libeclipse-e4-core-di-extensions-java
+Architecture: all
+Depends: ${misc:Depends}, ${bundle-Depends}, libatinject-jsr330-api-java
+Description: Eclipse Dependency Injection Extensions
+ Eclipse Platform defines the set of frameworks and common services that
+ collectively make up infrastructure required to support the use of Eclipse
+ as a component model, as a Rich Client Platform (RCP) and as a comprehensive
+ tool integration platform. The core component provides basic platform
+ infrastructure that does not involve any UI.
+ .
+ This package contains the org.eclipse.e4.core.di.extensions bundle.
+
+Package: libeclipse-e4-core-di-extensions-supplier-java
+Architecture: all
+Depends: ${misc:Depends}, ${bundle-Depends}, libeclipse-osgi-services-java, libequinox-preferences-java
+Description: Eclipse Dependency Injection Extensions Supplier
+ Eclipse Platform defines the set of frameworks and common services that
+ collectively make up infrastructure required to support the use of Eclipse
+ as a component model, as a Rich Client Platform (RCP) and as a comprehensive
+ tool integration platform. The core component provides basic platform
+ infrastructure that does not involve any UI.
+ .
+ This package contains the org.eclipse.e4.core.di.extensions.supplier bundle.
+
+Package: libeclipse-e4-core-services-java
+Architecture: all
+Depends: ${misc:Depends}, ${bundle-Depends}, libatinject-jsr330-api-java, libequinox-common-java
+Description: Eclipse Application Services
+ Eclipse Platform defines the set of frameworks and common services that
+ collectively make up infrastructure required to support the use of Eclipse
+ as a component model, as a Rich Client Platform (RCP) and as a comprehensive
+ tool integration platform. The core component provides basic platform
+ infrastructure that does not involve any UI.
+ .
+ This package contains the org.eclipse.e4.core.services bundle.