diff --git a/modules/@angular/common/src/pipes/async_pipe.ts b/modules/@angular/common/src/pipes/async_pipe.ts
index b3bfebfe65..a64126d575 100644
--- a/modules/@angular/common/src/pipes/async_pipe.ts
+++ b/modules/@angular/common/src/pipes/async_pipe.ts
@@ -6,8 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ChangeDetectorRef, OnDestroy, Pipe, PipeTransform, WrappedValue, ɵisObservable, ɵisPromise} from '@angular/core';
-import {EventEmitter, Observable} from '../facade/async';
+import {ChangeDetectorRef, EventEmitter, OnDestroy, Pipe, PipeTransform, WrappedValue, ɵisObservable, ɵisPromise} from '@angular/core';
+import {Observable} from 'rxjs/Observable';
+
 import {invalidPipeArgumentError} from './invalid_pipe_argument_error';
 
 interface SubscriptionStrategy {
diff --git a/modules/@angular/common/test/pipes/async_pipe_spec.ts b/modules/@angular/common/test/pipes/async_pipe_spec.ts
index 61ea0d5b9b..aed1b22ef1 100644
--- a/modules/@angular/common/test/pipes/async_pipe_spec.ts
+++ b/modules/@angular/common/test/pipes/async_pipe_spec.ts
@@ -7,12 +7,11 @@
  */
 
 import {AsyncPipe} from '@angular/common';
-import {WrappedValue} from '@angular/core';
+import {EventEmitter, WrappedValue} from '@angular/core';
 import {AsyncTestCompleter, beforeEach, describe, expect, inject, it} from '@angular/core/testing/testing_internal';
 import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter';
 import {browserDetection} from '@angular/platform-browser/testing/browser_util';
 
-import {EventEmitter} from '../../src/facade/async';
 import {SpyChangeDetectorRef} from '../spies';
 
 export function main() {
diff --git a/modules/@angular/core/src/core.ts b/modules/@angular/core/src/core.ts
index b43469887a..d208277617 100644
--- a/modules/@angular/core/src/core.ts
+++ b/modules/@angular/core/src/core.ts
@@ -29,7 +29,7 @@ export {TRANSLATIONS, TRANSLATIONS_FORMAT, LOCALE_ID, MissingTranslationStrategy
 export {ApplicationModule} from './application_module';
 export {wtfCreateScope, wtfLeave, wtfStartTimeRange, wtfEndTimeRange, WtfScopeFn} from './profile/profile';
 export {Type} from './type';
-export {EventEmitter} from './facade/async';
+export {EventEmitter} from './event_emitter';
 export {ErrorHandler} from './error_handler';
 export * from './core_private_export';
 export {Sanitizer, SecurityContext} from './security';
@@ -59,4 +59,4 @@ export type AnimationStyles = any;
 /**
  * @deprecated from v4
  */
-export type AnimationKeyframe = any;
\ No newline at end of file
+export type AnimationKeyframe = any;
diff --git a/modules/@angular/facade/src/async.ts b/modules/@angular/core/src/event_emitter.ts
similarity index 97%
rename from modules/@angular/facade/src/async.ts
rename to modules/@angular/core/src/event_emitter.ts
index feaa9c05af..5cdbc2a3a3 100644
--- a/modules/@angular/facade/src/async.ts
+++ b/modules/@angular/core/src/event_emitter.ts
@@ -8,9 +8,6 @@
 
 import {Subject} from 'rxjs/Subject';
 
-export {Observable} from 'rxjs/Observable';
-export {Subject} from 'rxjs/Subject';
-
 /**
  * Use by directives and components to emit custom Events.
  *
diff --git a/modules/@angular/core/src/linker/query_list.ts b/modules/@angular/core/src/linker/query_list.ts
index 708ceffac1..e09cadfebb 100644
--- a/modules/@angular/core/src/linker/query_list.ts
+++ b/modules/@angular/core/src/linker/query_list.ts
@@ -6,10 +6,13 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {EventEmitter, Observable} from '../facade/async';
+import {Observable} from 'rxjs/Observable';
+
+import {EventEmitter} from '../event_emitter';
 import {ListWrapper} from '../facade/collection';
 import {getSymbolIterator} from '../facade/lang';
 
+
 /**
  * An unmodifiable list of items that Angular keeps up to date when the state
  * of the application changes.
diff --git a/modules/@angular/core/src/zone/ng_zone.ts b/modules/@angular/core/src/zone/ng_zone.ts
index 2fa205d080..a821c3f350 100644
--- a/modules/@angular/core/src/zone/ng_zone.ts
+++ b/modules/@angular/core/src/zone/ng_zone.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {EventEmitter} from '../facade/async';
+import {EventEmitter} from '../event_emitter';
 
 /**
  * An injectable service for executing work inside or outside of the Angular zone.
diff --git a/modules/@angular/core/test/debug/debug_node_spec.ts b/modules/@angular/core/test/debug/debug_node_spec.ts
index 07bfd6ee6d..bf226e1d16 100644
--- a/modules/@angular/core/test/debug/debug_node_spec.ts
+++ b/modules/@angular/core/test/debug/debug_node_spec.ts
@@ -7,15 +7,13 @@
  */
 
 
-import {Injectable, NO_ERRORS_SCHEMA} from '@angular/core';
+import {EventEmitter, Injectable, NO_ERRORS_SCHEMA} from '@angular/core';
 import {Component, Directive, Input} from '@angular/core/src/metadata';
 import {ComponentFixture, TestBed, async} from '@angular/core/testing';
 import {By} from '@angular/platform-browser/src/dom/debug/by';
 import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter';
 import {expect} from '@angular/platform-browser/testing/matchers';
 
-import {EventEmitter} from '../../src/facade/async';
-
 @Injectable()
 class Logger {
   logs: string[];
diff --git a/modules/@angular/facade/test/async_spec.ts b/modules/@angular/core/test/event_emitter_spec.ts
similarity index 98%
rename from modules/@angular/facade/test/async_spec.ts
rename to modules/@angular/core/test/event_emitter_spec.ts
index 7490231801..c31546dccb 100644
--- a/modules/@angular/facade/test/async_spec.ts
+++ b/modules/@angular/core/test/event_emitter_spec.ts
@@ -7,7 +7,7 @@
  */
 
 import {AsyncTestCompleter, beforeEach, describe, expect, inject, it} from '@angular/core/testing/testing_internal';
-import {EventEmitter} from '../src/async';
+import {EventEmitter} from '../src/event_emitter';
 
 export function main() {
   describe('EventEmitter', () => {
diff --git a/modules/@angular/core/test/facade/observable_spec.ts b/modules/@angular/core/test/facade/observable_spec.ts
index ad345da3bb..1b9b387dd8 100644
--- a/modules/@angular/core/test/facade/observable_spec.ts
+++ b/modules/@angular/core/test/facade/observable_spec.ts
@@ -7,8 +7,7 @@
  */
 
 import {AsyncTestCompleter, describe, expect, inject, it} from '@angular/core/testing/testing_internal';
-
-import {Observable} from '../../src/facade/async';
+import {Observable} from 'rxjs/Observable';
 
 export function main() {
   describe('Observable', () => {
diff --git a/modules/@angular/core/test/linker/change_detection_integration_spec.ts b/modules/@angular/core/test/linker/change_detection_integration_spec.ts
index ae2cfa3cfc..a4a2ffdefe 100644
--- a/modules/@angular/core/test/linker/change_detection_integration_spec.ts
+++ b/modules/@angular/core/test/linker/change_detection_integration_spec.ts
@@ -8,15 +8,13 @@
 
 import {ElementSchemaRegistry} from '@angular/compiler/src/schema/element_schema_registry';
 import {TEST_COMPILER_PROVIDERS} from '@angular/compiler/testing/test_bindings';
-import {AfterContentChecked, AfterContentInit, AfterViewChecked, AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, DebugElement, Directive, DoCheck, HostBinding, Inject, Injectable, Input, OnChanges, OnDestroy, OnInit, Output, Pipe, PipeTransform, RenderComponentType, Renderer, RendererFactoryV2, RootRenderer, SimpleChange, SimpleChanges, TemplateRef, Type, ViewChild, ViewContainerRef, WrappedValue} from '@angular/core';
+import {AfterContentChecked, AfterContentInit, AfterViewChecked, AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, DebugElement, Directive, DoCheck, EventEmitter, HostBinding, Inject, Injectable, Input, OnChanges, OnDestroy, OnInit, Output, Pipe, PipeTransform, RenderComponentType, Renderer, RendererFactoryV2, RootRenderer, SimpleChange, SimpleChanges, TemplateRef, Type, ViewChild, ViewContainerRef, WrappedValue} from '@angular/core';
 import {ComponentFixture, TestBed, fakeAsync} from '@angular/core/testing';
 import {By} from '@angular/platform-browser/src/dom/debug/by';
 import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter';
 import {expect} from '@angular/platform-browser/testing/matchers';
-
 import {DomElementSchemaRegistry} from '../../../compiler/index';
 import {MockSchemaRegistry} from '../../../compiler/testing/index';
-import {EventEmitter} from '../../src/facade/async';
 
 export function main() {
   let elSchema: MockSchemaRegistry;
diff --git a/modules/@angular/core/test/linker/integration_spec.ts b/modules/@angular/core/test/linker/integration_spec.ts
index fdf2a60262..5c3339aaa5 100644
--- a/modules/@angular/core/test/linker/integration_spec.ts
+++ b/modules/@angular/core/test/linker/integration_spec.ts
@@ -7,7 +7,7 @@
  */
 
 import {CommonModule} from '@angular/common';
-import {ComponentFactory, Host, Inject, Injectable, InjectionToken, Injector, NO_ERRORS_SCHEMA, NgModule, OnDestroy, ReflectiveInjector, SkipSelf} from '@angular/core';
+import {ComponentFactory, EventEmitter, Host, Inject, Injectable, InjectionToken, Injector, NO_ERRORS_SCHEMA, NgModule, OnDestroy, ReflectiveInjector, SkipSelf} from '@angular/core';
 import {ChangeDetectionStrategy, ChangeDetectorRef, PipeTransform} from '@angular/core/src/change_detection/change_detection';
 import {getDebugContext} from '@angular/core/src/errors';
 import {ComponentFactoryResolver} from '@angular/core/src/linker/component_factory_resolver';
@@ -23,7 +23,6 @@ import {DOCUMENT} from '@angular/platform-browser/src/dom/dom_tokens';
 import {dispatchEvent, el} from '@angular/platform-browser/testing/browser_util';
 import {expect} from '@angular/platform-browser/testing/matchers';
 
-import {EventEmitter} from '../../src/facade/async';
 import {stringify} from '../../src/facade/lang';
 
 const ANCHOR_ELEMENT = new InjectionToken('AnchorElement');
diff --git a/modules/@angular/core/test/testability/testability_spec.ts b/modules/@angular/core/test/testability/testability_spec.ts
index 3bf138c1dc..f892c51907 100644
--- a/modules/@angular/core/test/testability/testability_spec.ts
+++ b/modules/@angular/core/test/testability/testability_spec.ts
@@ -6,15 +6,16 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {EventEmitter} from '@angular/core';
 import {Injectable} from '@angular/core/src/di';
 import {Testability} from '@angular/core/src/testability/testability';
 import {NgZone} from '@angular/core/src/zone/ng_zone';
 import {AsyncTestCompleter, SpyObject, beforeEach, describe, expect, inject, it} from '@angular/core/testing/testing_internal';
 
-import {EventEmitter} from '../../src/facade/async';
 import {scheduleMicroTask} from '../../src/facade/lang';
 
 
+
 // Schedules a microtasks (using a resolved promise .then())
 function microTask(fn: Function): void {
   scheduleMicroTask(() => {
diff --git a/modules/@angular/core/testing/ng_zone_mock.ts b/modules/@angular/core/testing/ng_zone_mock.ts
index dffa0296e7..8dae724ad9 100644
--- a/modules/@angular/core/testing/ng_zone_mock.ts
+++ b/modules/@angular/core/testing/ng_zone_mock.ts
@@ -6,8 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Injectable, NgZone} from '@angular/core';
-import {EventEmitter} from './facade/async';
+import {EventEmitter, Injectable, NgZone} from '@angular/core';
+
 
 /**
  * A mock implementation of {@link NgZone}.
diff --git a/modules/@angular/forms/src/directives/abstract_control_directive.ts b/modules/@angular/forms/src/directives/abstract_control_directive.ts
index 5d76cffaf3..514d23d196 100644
--- a/modules/@angular/forms/src/directives/abstract_control_directive.ts
+++ b/modules/@angular/forms/src/directives/abstract_control_directive.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Observable} from '../facade/async';
+import {Observable} from 'rxjs/Observable';
 import {AbstractControl} from '../model';
 
 /**
diff --git a/modules/@angular/forms/src/directives/ng_form.ts b/modules/@angular/forms/src/directives/ng_form.ts
index 20015ba3d8..6803a6d296 100644
--- a/modules/@angular/forms/src/directives/ng_form.ts
+++ b/modules/@angular/forms/src/directives/ng_form.ts
@@ -6,9 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Directive, Inject, Optional, Self, forwardRef} from '@angular/core';
+import {Directive, EventEmitter, Inject, Optional, Self, forwardRef} from '@angular/core';
 
-import {EventEmitter} from '../facade/async';
 import {AbstractControl, FormControl, FormGroup} from '../model';
 import {NG_ASYNC_VALIDATORS, NG_VALIDATORS} from '../validators';
 
diff --git a/modules/@angular/forms/src/directives/ng_model.ts b/modules/@angular/forms/src/directives/ng_model.ts
index 750fa3663e..44a779328c 100644
--- a/modules/@angular/forms/src/directives/ng_model.ts
+++ b/modules/@angular/forms/src/directives/ng_model.ts
@@ -6,9 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Directive, Host, HostListener, Inject, Input, OnChanges, OnDestroy, Optional, Output, Self, SimpleChanges, forwardRef} from '@angular/core';
+import {Directive, EventEmitter, Host, HostListener, Inject, Input, OnChanges, OnDestroy, Optional, Output, Self, SimpleChanges, forwardRef} from '@angular/core';
 
-import {EventEmitter} from '../facade/async';
 import {FormControl} from '../model';
 import {NG_ASYNC_VALIDATORS, NG_VALIDATORS} from '../validators';
 
diff --git a/modules/@angular/forms/src/directives/reactive_directives/form_control_directive.ts b/modules/@angular/forms/src/directives/reactive_directives/form_control_directive.ts
index 0fda64f0ff..9db23e2aeb 100644
--- a/modules/@angular/forms/src/directives/reactive_directives/form_control_directive.ts
+++ b/modules/@angular/forms/src/directives/reactive_directives/form_control_directive.ts
@@ -6,9 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Directive, Inject, Input, OnChanges, Optional, Output, Self, SimpleChanges, forwardRef} from '@angular/core';
+import {Directive, EventEmitter, Inject, Input, OnChanges, Optional, Output, Self, SimpleChanges, forwardRef} from '@angular/core';
 
-import {EventEmitter} from '../../facade/async';
 import {FormControl} from '../../model';
 import {NG_ASYNC_VALIDATORS, NG_VALIDATORS} from '../../validators';
 import {ControlValueAccessor, NG_VALUE_ACCESSOR} from '../control_value_accessor';
diff --git a/modules/@angular/forms/src/directives/reactive_directives/form_control_name.ts b/modules/@angular/forms/src/directives/reactive_directives/form_control_name.ts
index ca91ed5419..def1aeb898 100644
--- a/modules/@angular/forms/src/directives/reactive_directives/form_control_name.ts
+++ b/modules/@angular/forms/src/directives/reactive_directives/form_control_name.ts
@@ -6,9 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Directive, Host, Inject, Input, OnChanges, OnDestroy, Optional, Output, Self, SimpleChanges, SkipSelf, forwardRef} from '@angular/core';
+import {Directive, EventEmitter, Host, Inject, Input, OnChanges, OnDestroy, Optional, Output, Self, SimpleChanges, SkipSelf, forwardRef} from '@angular/core';
 
-import {EventEmitter} from '../../facade/async';
 import {FormControl} from '../../model';
 import {NG_ASYNC_VALIDATORS, NG_VALIDATORS} from '../../validators';
 import {AbstractFormGroupDirective} from '../abstract_form_group_directive';
diff --git a/modules/@angular/forms/src/directives/reactive_directives/form_group_directive.ts b/modules/@angular/forms/src/directives/reactive_directives/form_group_directive.ts
index 8ede88932c..1f6f78f82b 100644
--- a/modules/@angular/forms/src/directives/reactive_directives/form_group_directive.ts
+++ b/modules/@angular/forms/src/directives/reactive_directives/form_group_directive.ts
@@ -6,9 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Directive, Inject, Input, OnChanges, Optional, Output, Self, SimpleChanges, forwardRef} from '@angular/core';
+import {Directive, EventEmitter, Inject, Input, OnChanges, Optional, Output, Self, SimpleChanges, forwardRef} from '@angular/core';
 
-import {EventEmitter} from '../../facade/async';
 import {ListWrapper} from '../../facade/collection';
 import {FormArray, FormControl, FormGroup} from '../../model';
 import {NG_ASYNC_VALIDATORS, NG_VALIDATORS, Validators} from '../../validators';
diff --git a/modules/@angular/forms/src/model.ts b/modules/@angular/forms/src/model.ts
index 48e83c00ed..1e28df9831 100644
--- a/modules/@angular/forms/src/model.ts
+++ b/modules/@angular/forms/src/model.ts
@@ -6,12 +6,12 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ɵisObservable as isObservable, ɵisPromise as isPromise} from '@angular/core';
+import {EventEmitter, ɵisObservable as isObservable, ɵisPromise as isPromise} from '@angular/core';
+import {Observable} from 'rxjs/Observable';
 import {fromPromise} from 'rxjs/observable/fromPromise';
 
 import {composeAsyncValidators, composeValidators} from './directives/shared';
 import {AsyncValidatorFn, ValidatorFn} from './directives/validators';
-import {EventEmitter, Observable} from './facade/async';
 
 
 
diff --git a/modules/@angular/forms/test/form_control_spec.ts b/modules/@angular/forms/test/form_control_spec.ts
index b9b2b87dbe..a6edc3114a 100644
--- a/modules/@angular/forms/test/form_control_spec.ts
+++ b/modules/@angular/forms/test/form_control_spec.ts
@@ -6,11 +6,11 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {EventEmitter} from '@angular/core';
 import {fakeAsync, tick} from '@angular/core/testing';
 import {AsyncTestCompleter, beforeEach, describe, inject, it} from '@angular/core/testing/testing_internal';
 import {FormControl, FormGroup, Validators} from '@angular/forms';
 
-import {EventEmitter} from '../src/facade/async';
 import {isPresent} from '../src/facade/lang';
 import {FormArray} from '../src/model';
 
diff --git a/modules/@angular/forms/test/form_group_spec.ts b/modules/@angular/forms/test/form_group_spec.ts
index 5b893d48a6..e37b735ccc 100644
--- a/modules/@angular/forms/test/form_group_spec.ts
+++ b/modules/@angular/forms/test/form_group_spec.ts
@@ -6,11 +6,11 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {EventEmitter} from '@angular/core';
 import {async, fakeAsync, tick} from '@angular/core/testing';
 import {AsyncTestCompleter, beforeEach, describe, inject, it} from '@angular/core/testing/testing_internal';
 import {AbstractControl, FormArray, FormControl, FormGroup, Validators} from '@angular/forms';
 
-import {EventEmitter} from '../src/facade/async';
 import {isPresent} from '../src/facade/lang';
 
 export function main() {
diff --git a/modules/@angular/forms/test/validators_spec.ts b/modules/@angular/forms/test/validators_spec.ts
index 54b31285ff..3de4dd1acb 100644
--- a/modules/@angular/forms/test/validators_spec.ts
+++ b/modules/@angular/forms/test/validators_spec.ts
@@ -6,6 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {EventEmitter} from '@angular/core';
 import {fakeAsync, tick} from '@angular/core/testing';
 import {describe, expect, it} from '@angular/core/testing/testing_internal';
 import {AbstractControl, FormArray, FormControl, FormGroup, Validators} from '@angular/forms';
@@ -13,7 +14,6 @@ import {Observable} from 'rxjs/Observable';
 
 import {normalizeAsyncValidator} from '../src/directives/normalize_validator';
 import {AsyncValidator} from '../src/directives/validators';
-import {EventEmitter} from '../src/facade/async';
 
 export function main() {
   function validator(key: string, error: any) {
diff --git a/modules/@angular/platform-webworker/src/web_workers/shared/client_message_broker.ts b/modules/@angular/platform-webworker/src/web_workers/shared/client_message_broker.ts
index cf27ee71bd..c8ea07dfe8 100644
--- a/modules/@angular/platform-webworker/src/web_workers/shared/client_message_broker.ts
+++ b/modules/@angular/platform-webworker/src/web_workers/shared/client_message_broker.ts
@@ -6,15 +6,15 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Injectable, Type} from '@angular/core';
+import {EventEmitter, Injectable, Type} from '@angular/core';
 
-import {EventEmitter} from '../../facade/async';
 import {stringify} from '../../facade/lang';
 
 import {MessageBus} from './message_bus';
 import {Serializer, SerializerTypes} from './serializer';
 
 
+
 /**
  * @experimental WebWorker support in Angular is experimental.
  */
diff --git a/modules/@angular/platform-webworker/src/web_workers/shared/message_bus.ts b/modules/@angular/platform-webworker/src/web_workers/shared/message_bus.ts
index 07df6719bf..16ccefae4c 100644
--- a/modules/@angular/platform-webworker/src/web_workers/shared/message_bus.ts
+++ b/modules/@angular/platform-webworker/src/web_workers/shared/message_bus.ts
@@ -6,9 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgZone} from '@angular/core';
+import {EventEmitter, NgZone} from '@angular/core';
 
-import {EventEmitter} from '../../facade/async';
 
 
 /**
diff --git a/modules/@angular/platform-webworker/src/web_workers/shared/post_message_bus.ts b/modules/@angular/platform-webworker/src/web_workers/shared/post_message_bus.ts
index 15217dad4e..f7c11f5bc8 100644
--- a/modules/@angular/platform-webworker/src/web_workers/shared/post_message_bus.ts
+++ b/modules/@angular/platform-webworker/src/web_workers/shared/post_message_bus.ts
@@ -6,9 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Injectable, NgZone} from '@angular/core';
-
-import {EventEmitter} from '../../facade/async';
+import {EventEmitter, Injectable, NgZone} from '@angular/core';
 
 import {MessageBus, MessageBusSink, MessageBusSource} from './message_bus';
 
diff --git a/modules/@angular/platform-webworker/src/web_workers/shared/service_message_broker.ts b/modules/@angular/platform-webworker/src/web_workers/shared/service_message_broker.ts
index 936f6a0413..665ecf1d12 100644
--- a/modules/@angular/platform-webworker/src/web_workers/shared/service_message_broker.ts
+++ b/modules/@angular/platform-webworker/src/web_workers/shared/service_message_broker.ts
@@ -6,12 +6,11 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Injectable, Type} from '@angular/core';
-
-import {EventEmitter} from '../../facade/async';
+import {EventEmitter, Injectable, Type} from '@angular/core';
 import {MessageBus} from '../shared/message_bus';
 import {Serializer, SerializerTypes} from '../shared/serializer';
 
+
 /**
  * @experimental WebWorker support in Angular is currently experimental.
  */
diff --git a/modules/@angular/platform-webworker/src/web_workers/ui/event_dispatcher.ts b/modules/@angular/platform-webworker/src/web_workers/ui/event_dispatcher.ts
index af79b98f99..9092bbb4ab 100644
--- a/modules/@angular/platform-webworker/src/web_workers/ui/event_dispatcher.ts
+++ b/modules/@angular/platform-webworker/src/web_workers/ui/event_dispatcher.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import {EventEmitter} from '../../facade/async';
+import {EventEmitter} from '@angular/core';
 import {Serializer, SerializerTypes} from '../shared/serializer';
 
 import {serializeEventWithTarget, serializeGenericEvent, serializeKeyboardEvent, serializeMouseEvent, serializeTransitionEvent} from './event_serializer';
diff --git a/modules/@angular/platform-webworker/src/web_workers/ui/platform_location.ts b/modules/@angular/platform-webworker/src/web_workers/ui/platform_location.ts
index 73845f5dee..2e0811e55f 100644
--- a/modules/@angular/platform-webworker/src/web_workers/ui/platform_location.ts
+++ b/modules/@angular/platform-webworker/src/web_workers/ui/platform_location.ts
@@ -7,10 +7,8 @@
  */
 
 import {LocationChangeListener} from '@angular/common';
-import {Injectable} from '@angular/core';
+import {EventEmitter, Injectable} from '@angular/core';
 import {ɵBrowserPlatformLocation as BrowserPlatformLocation} from '@angular/platform-browser';
-
-import {EventEmitter} from '../../facade/async';
 import {MessageBus} from '../shared/message_bus';
 import {ROUTER_CHANNEL} from '../shared/messaging_api';
 import {LocationType, Serializer, SerializerTypes} from '../shared/serializer';
diff --git a/modules/@angular/platform-webworker/src/web_workers/worker/platform_location.ts b/modules/@angular/platform-webworker/src/web_workers/worker/platform_location.ts
index 8af4804277..4441d22da5 100644
--- a/modules/@angular/platform-webworker/src/web_workers/worker/platform_location.ts
+++ b/modules/@angular/platform-webworker/src/web_workers/worker/platform_location.ts
@@ -7,9 +7,7 @@
  */
 
 import {LocationChangeListener, PlatformLocation} from '@angular/common';
-import {Injectable} from '@angular/core';
-
-import {EventEmitter} from '../../facade/async';
+import {EventEmitter, Injectable} from '@angular/core';
 import {ClientMessageBroker, ClientMessageBrokerFactory, FnArg, UiArguments} from '../shared/client_message_broker';
 import {MessageBus} from '../shared/message_bus';
 import {ROUTER_CHANNEL} from '../shared/messaging_api';
diff --git a/modules/@angular/platform-webworker/test/web_workers/shared/mock_event_emitter.ts b/modules/@angular/platform-webworker/test/web_workers/shared/mock_event_emitter.ts
index 174c4fa056..19f2a30459 100644
--- a/modules/@angular/platform-webworker/test/web_workers/shared/mock_event_emitter.ts
+++ b/modules/@angular/platform-webworker/test/web_workers/shared/mock_event_emitter.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {EventEmitter} from '../../../src/facade/async';
+import {EventEmitter} from '@angular/core';
 
 export class MockEventEmitter<T> extends EventEmitter<T> {
   private _nextFns: Function[] = [];