diff --git a/build.sh b/build.sh
index 7b373e0aba..5f3a6e7f90 100755
--- a/build.sh
+++ b/build.sh
@@ -85,7 +85,7 @@ do
 
     if [[ ${PACKAGE} == "router-deprecated" ]]; then
       echo "====== (esm)COMPILING: \$(npm bin)/tsc -p ${SRCDIR}/tsconfig-es2015.json ====="
-      $(npm bin)/tsc -p ${SRCDIR}/tsconfig-es2015.json
+      $(npm bin)/tsc --emitDecoratorMetadata -p ${SRCDIR}/tsconfig-es2015.json
     else
       echo "====== (esm)COMPILING: $TSC -p ${SRCDIR}/tsconfig-es2015.json ====="
       $TSC -p ${SRCDIR}/tsconfig-es2015.json
diff --git a/modules/@angular/common/tsconfig-es2015.json b/modules/@angular/common/tsconfig-es2015.json
index 9cc18d6dcf..eb3aafe295 100644
--- a/modules/@angular/common/tsconfig-es2015.json
+++ b/modules/@angular/common/tsconfig-es2015.json
@@ -1,12 +1,8 @@
 {
-  "angularCompilerOptions": {
-    "skipTemplateCodegen": true
-  },
   "compilerOptions": {
     "baseUrl": ".",
     "declaration": true,
     "stripInternal": true,
-    "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "module": "es2015",
     "moduleResolution": "node",
diff --git a/modules/@angular/common/tsconfig-es5.json b/modules/@angular/common/tsconfig-es5.json
index b11904fff7..1ddbe55386 100644
--- a/modules/@angular/common/tsconfig-es5.json
+++ b/modules/@angular/common/tsconfig-es5.json
@@ -1,12 +1,8 @@
 {
-  "angularCompilerOptions": {
-    "skipTemplateCodegen": true
-  },
   "compilerOptions": {
     "baseUrl": ".",
     "declaration": true,
     "stripInternal": true,
-    "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "module": "commonjs",
     "moduleResolution": "node",
diff --git a/modules/@angular/compiler-cli/integrationtest/src/a/multiple_components.ts b/modules/@angular/compiler-cli/integrationtest/src/a/multiple_components.ts
index fa2450e477..35624d77d9 100644
--- a/modules/@angular/compiler-cli/integrationtest/src/a/multiple_components.ts
+++ b/modules/@angular/compiler-cli/integrationtest/src/a/multiple_components.ts
@@ -22,7 +22,7 @@ export class HasCustomDecorator {
 
 // Verify that custom decorators have metadata collected, eg Ionic
 export function Page(c: any): (f: Function) => void {
-  return c;
+  return NotADirective;
 }
 
 @Page({template: 'Ionic template'})
diff --git a/modules/@angular/compiler-cli/tsconfig-es5.json b/modules/@angular/compiler-cli/tsconfig-es5.json
index 4a0ff6f020..ee6b249db3 100644
--- a/modules/@angular/compiler-cli/tsconfig-es5.json
+++ b/modules/@angular/compiler-cli/tsconfig-es5.json
@@ -1,7 +1,4 @@
 {
-  "angularCompilerOptions": {
-    "skipTemplateCodegen": true
-  },
     "compilerOptions": {
         "module": "commonjs",
         "target": "es5",
diff --git a/modules/@angular/compiler/test/offline_compiler_util.ts b/modules/@angular/compiler/test/offline_compiler_util.ts
index 5336ccb3f6..f7aec83358 100644
--- a/modules/@angular/compiler/test/offline_compiler_util.ts
+++ b/modules/@angular/compiler/test/offline_compiler_util.ts
@@ -71,4 +71,4 @@ export class SimpleJsImportGenerator implements ImportGenerator {
       return importedUrlStr;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/modules/@angular/compiler/tsconfig-es2015.json b/modules/@angular/compiler/tsconfig-es2015.json
index 04d3b21b88..c37d439b74 100644
--- a/modules/@angular/compiler/tsconfig-es2015.json
+++ b/modules/@angular/compiler/tsconfig-es2015.json
@@ -1,7 +1,4 @@
 {
-  "angularCompilerOptions": {
-    "skipTemplateCodegen": true
-  },
   "compilerOptions": {
     "baseUrl": ".",
     "declaration": true,
diff --git a/modules/@angular/compiler/tsconfig-es5.json b/modules/@angular/compiler/tsconfig-es5.json
index b71e05fd7e..2a9f278580 100644
--- a/modules/@angular/compiler/tsconfig-es5.json
+++ b/modules/@angular/compiler/tsconfig-es5.json
@@ -1,12 +1,8 @@
 {
-  "angularCompilerOptions": {
-    "skipTemplateCodegen": true
-  },
   "compilerOptions": {
     "baseUrl": ".",
     "declaration": true,
     "stripInternal": true,
-    "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "module": "commonjs",
     "moduleResolution": "node",
diff --git a/modules/@angular/core/src/di/decorators.ts b/modules/@angular/core/src/di/decorators.ts
index 61db34eb65..ec7cb70b1f 100644
--- a/modules/@angular/core/src/di/decorators.ts
+++ b/modules/@angular/core/src/di/decorators.ts
@@ -60,18 +60,21 @@ export interface SkipSelfMetadataFactory {
 /**
  * Factory for creating {@link InjectMetadata}.
  * @stable
+ * @Annotation
  */
 export var Inject: InjectMetadataFactory = makeParamDecorator(InjectMetadata);
 
 /**
  * Factory for creating {@link OptionalMetadata}.
  * @stable
+ * @Annotation
  */
 export var Optional: OptionalMetadataFactory = makeParamDecorator(OptionalMetadata);
 
 /**
  * Factory for creating {@link InjectableMetadata}.
  * @stable
+ * @Annotation
  */
 export var Injectable: InjectableMetadataFactory =
     <InjectableMetadataFactory>makeDecorator(InjectableMetadata);
@@ -79,17 +82,20 @@ export var Injectable: InjectableMetadataFactory =
 /**
  * Factory for creating {@link SelfMetadata}.
  * @stable
+ * @Annotation
  */
 export var Self: SelfMetadataFactory = makeParamDecorator(SelfMetadata);
 
 /**
  * Factory for creating {@link HostMetadata}.
  * @stable
+ * @Annotation
  */
 export var Host: HostMetadataFactory = makeParamDecorator(HostMetadata);
 
 /**
  * Factory for creating {@link SkipSelfMetadata}.
  * @stable
+ * @Annotation
  */
 export var SkipSelf: SkipSelfMetadataFactory = makeParamDecorator(SkipSelfMetadata);
diff --git a/modules/@angular/core/src/metadata.ts b/modules/@angular/core/src/metadata.ts
index 7aed836661..acf360979d 100644
--- a/modules/@angular/core/src/metadata.ts
+++ b/modules/@angular/core/src/metadata.ts
@@ -471,6 +471,7 @@ export interface HostListenerMetadataFactory {
  *
  * {@example core/ts/metadata/metadata.ts region='component'}
  * @stable
+ * @Annotation
  */
 export var Component: ComponentMetadataFactory =
     <ComponentMetadataFactory>makeDecorator(ComponentMetadata, (fn: any) => fn.View = View);
@@ -854,6 +855,7 @@ export var Component: ComponentMetadataFactory =
  * the instantiated
  * view occurs on the second `<li></li>` which is a sibling to the `<template>` element.
  * @stable
+ * @Annotation
  */
 export var Directive: DirectiveMetadataFactory =
     <DirectiveMetadataFactory>makeDecorator(DirectiveMetadata);
@@ -888,6 +890,7 @@ export var Directive: DirectiveMetadataFactory =
  * }
  * ```
  * @deprecated
+ * @Annotation
  */
 var View: ViewMetadataFactory =
     <ViewMetadataFactory>makeDecorator(ViewMetadata, (fn: any) => fn.View = View);
@@ -909,6 +912,7 @@ var View: ViewMetadataFactory =
  *
  * {@example core/ts/metadata/metadata.ts region='attributeMetadata'}
  * @stable
+ * @Annotation
  */
 export var Attribute: AttributeMetadataFactory = makeParamDecorator(AttributeMetadata);
 
@@ -1020,6 +1024,7 @@ export var Attribute: AttributeMetadataFactory = makeParamDecorator(AttributeMet
  * The injected object is an unmodifiable live list.
  * See {@link QueryList} for more details.
  * @deprecated
+ * @Annotation
  */
 export var Query: QueryMetadataFactory = makeParamDecorator(QueryMetadata);
 
@@ -1044,6 +1049,7 @@ export var Query: QueryMetadataFactory = makeParamDecorator(QueryMetadata);
  * }
  * ```
  * @stable
+ * @Annotation
  */
 export var ContentChildren: ContentChildrenMetadataFactory =
     makePropDecorator(ContentChildrenMetadata);
@@ -1078,6 +1084,7 @@ export var ContentChildren: ContentChildrenMetadataFactory =
  * </container>
  * ```
  * @stable
+ * @Annotation
  */
 export var ContentChild: ContentChildMetadataFactory = makePropDecorator(ContentChildMetadata);
 
@@ -1161,6 +1168,7 @@ export var ContentChild: ContentChildMetadataFactory = makePropDecorator(Content
  *
  * See also: [ViewChildrenMetadata]
  * @stable
+ * @Annotation
  */
 export var ViewChildren: ViewChildrenMetadataFactory = makePropDecorator(ViewChildrenMetadata);
 
@@ -1235,6 +1243,7 @@ export var ViewChildren: ViewChildrenMetadataFactory = makePropDecorator(ViewChi
  * ```
  * See also: [ViewChildMetadata]
  * @stable
+ * @Annotation
  */
 export var ViewChild: ViewChildMetadataFactory = makePropDecorator(ViewChildMetadata);
 
@@ -1274,6 +1283,7 @@ export var ViewChild: ViewChildMetadataFactory = makePropDecorator(ViewChildMeta
  * The injected object is an iterable and observable live list.
  * See {@link QueryList} for more details.
  * @deprecated
+ * @Annotation
  */
 export var ViewQuery: QueryMetadataFactory = makeParamDecorator(ViewQueryMetadata);
 
@@ -1285,6 +1295,7 @@ export var ViewQuery: QueryMetadataFactory = makeParamDecorator(ViewQueryMetadat
  *
  * {@example core/ts/metadata/metadata.ts region='pipe'}
  * @stable
+ * @Annotation
  */
 export var Pipe: PipeMetadataFactory = <PipeMetadataFactory>makeDecorator(PipeMetadata);
 
@@ -1330,6 +1341,7 @@ export var Pipe: PipeMetadataFactory = <PipeMetadataFactory>makeDecorator(PipeMe
  * bootstrap(App);
  * ```
  * @stable
+ * @Annotation
  */
 export var Input: InputMetadataFactory = makePropDecorator(InputMetadata);
 
@@ -1375,6 +1387,7 @@ export var Input: InputMetadataFactory = makePropDecorator(InputMetadata);
  * bootstrap(App);
  * ```
  * @stable
+ * @Annotation
  */
 export var Output: OutputMetadataFactory = makePropDecorator(OutputMetadata);
 
@@ -1414,6 +1427,7 @@ export var Output: OutputMetadataFactory = makePropDecorator(OutputMetadata);
  * bootstrap(App);
  * ```
  * @stable
+ * @Annotation
  */
 export var HostBinding: HostBindingMetadataFactory = makePropDecorator(HostBindingMetadata);
 
@@ -1452,5 +1466,6 @@ export var HostBinding: HostBindingMetadataFactory = makePropDecorator(HostBindi
  * bootstrap(App);
  * ```
  * @stable
+ * @Annotation
  */
 export var HostListener: HostListenerMetadataFactory = makePropDecorator(HostListenerMetadata);
diff --git a/modules/@angular/core/test/reflection/reflector_common.ts b/modules/@angular/core/test/reflection/reflector_common.ts
index e880f19a09..52bfa74fda 100644
--- a/modules/@angular/core/test/reflection/reflector_common.ts
+++ b/modules/@angular/core/test/reflection/reflector_common.ts
@@ -24,9 +24,9 @@ export function propDecorator(value: any /** TODO #9100 */) {
   return new PropDecoratorMeta(value);
 }
 
-export var ClassDecorator = makeDecorator(ClassDecoratorMeta);
-export var ParamDecorator = makeParamDecorator(ParamDecoratorMeta);
-export var PropDecorator = makePropDecorator(PropDecoratorMeta);
+/** @Annotation */ export var ClassDecorator = makeDecorator(ClassDecoratorMeta);
+/** @Annotation */ export var ParamDecorator = makeParamDecorator(ParamDecoratorMeta);
+/** @Annotation */ export var PropDecorator = makePropDecorator(PropDecoratorMeta);
 
 // used only in Dart
 export class HasGetterAndSetterDecorators {}
diff --git a/modules/@angular/core/tsconfig-es2015.json b/modules/@angular/core/tsconfig-es2015.json
index 3a96a7fa0d..72c42414af 100644
--- a/modules/@angular/core/tsconfig-es2015.json
+++ b/modules/@angular/core/tsconfig-es2015.json
@@ -1,12 +1,8 @@
 {
-  "angularCompilerOptions": {
-    "skipTemplateCodegen": true
-  },
   "compilerOptions": {
     "baseUrl": ".",
     "declaration": true,
     "stripInternal": true,
-    "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "module": "es2015",
     "moduleResolution": "node",
diff --git a/modules/@angular/core/tsconfig-es5.json b/modules/@angular/core/tsconfig-es5.json
index b9855c2c9c..4edc062bfa 100644
--- a/modules/@angular/core/tsconfig-es5.json
+++ b/modules/@angular/core/tsconfig-es5.json
@@ -1,12 +1,8 @@
 {
-  "angularCompilerOptions": {
-    "skipTemplateCodegen": true
-  },
   "compilerOptions": {
     "baseUrl": ".",
     "declaration": true,
     "stripInternal": true,
-    "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "module": "commonjs",
     "moduleResolution": "node",
diff --git a/modules/@angular/forms/tsconfig-es2015.json b/modules/@angular/forms/tsconfig-es2015.json
index 788a51db95..e4a9aaa623 100644
--- a/modules/@angular/forms/tsconfig-es2015.json
+++ b/modules/@angular/forms/tsconfig-es2015.json
@@ -1,12 +1,8 @@
 {
-  "angularCompilerOptions": {
-    "skipTemplateCodegen": true
-  },
   "compilerOptions": {
     "baseUrl": ".",
     "declaration": true,
     "stripInternal": true,
-    "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "module": "es2015",
     "moduleResolution": "node",
diff --git a/modules/@angular/forms/tsconfig-es5.json b/modules/@angular/forms/tsconfig-es5.json
index 2fd7aa1799..7e4b6be8dc 100644
--- a/modules/@angular/forms/tsconfig-es5.json
+++ b/modules/@angular/forms/tsconfig-es5.json
@@ -1,12 +1,8 @@
 {
-  "angularCompilerOptions": {
-    "skipTemplateCodegen": true
-  },
   "compilerOptions": {
     "baseUrl": ".",
     "declaration": true,
     "stripInternal": true,
-    "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "module": "commonjs",
     "moduleResolution": "node",
diff --git a/modules/@angular/http/tsconfig-es2015.json b/modules/@angular/http/tsconfig-es2015.json
index f11638fb7b..f39ddf63ac 100644
--- a/modules/@angular/http/tsconfig-es2015.json
+++ b/modules/@angular/http/tsconfig-es2015.json
@@ -1,12 +1,8 @@
 {
-  "angularCompilerOptions": {
-    "skipTemplateCodegen": true
-  },
   "compilerOptions": {
     "baseUrl": ".",
     "declaration": true,
     "stripInternal": true,
-    "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "module": "es2015",
     "moduleResolution": "node",
diff --git a/modules/@angular/http/tsconfig-es5.json b/modules/@angular/http/tsconfig-es5.json
index 43f06c4c88..d79d6b9838 100644
--- a/modules/@angular/http/tsconfig-es5.json
+++ b/modules/@angular/http/tsconfig-es5.json
@@ -1,12 +1,8 @@
 {
-  "angularCompilerOptions": {
-    "skipTemplateCodegen": true
-  },
   "compilerOptions": {
     "baseUrl": ".",
     "declaration": true,
     "stripInternal": true,
-    "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "module": "commonjs",
     "moduleResolution": "node",
diff --git a/modules/@angular/platform-browser-dynamic/tsconfig-es2015.json b/modules/@angular/platform-browser-dynamic/tsconfig-es2015.json
index 327906edf4..fc2594407f 100644
--- a/modules/@angular/platform-browser-dynamic/tsconfig-es2015.json
+++ b/modules/@angular/platform-browser-dynamic/tsconfig-es2015.json
@@ -1,12 +1,8 @@
 {
-  "angularCompilerOptions": {
-    "skipTemplateCodegen": true
-  },
   "compilerOptions": {
     "baseUrl": ".",
     "declaration": true,
     "stripInternal": true,
-    "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "module": "es2015",
     "moduleResolution": "node",
diff --git a/modules/@angular/platform-browser-dynamic/tsconfig-es5.json b/modules/@angular/platform-browser-dynamic/tsconfig-es5.json
index e169935ee1..e991da02cc 100644
--- a/modules/@angular/platform-browser-dynamic/tsconfig-es5.json
+++ b/modules/@angular/platform-browser-dynamic/tsconfig-es5.json
@@ -1,12 +1,8 @@
 {
-  "angularCompilerOptions": {
-    "skipTemplateCodegen": true
-  },
   "compilerOptions": {
     "baseUrl": ".",
     "declaration": true,
     "stripInternal": true,
-    "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "module": "commonjs",
     "moduleResolution": "node",
diff --git a/modules/@angular/platform-browser/tsconfig-es2015.json b/modules/@angular/platform-browser/tsconfig-es2015.json
index 4d2a797f16..8986bc7f8b 100644
--- a/modules/@angular/platform-browser/tsconfig-es2015.json
+++ b/modules/@angular/platform-browser/tsconfig-es2015.json
@@ -1,12 +1,8 @@
 {
-  "angularCompilerOptions": {
-    "skipTemplateCodegen": true
-  },
   "compilerOptions": {
     "baseUrl": ".",
     "declaration": true,
     "stripInternal": true,
-    "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "module": "es2015",
     "moduleResolution": "node",
diff --git a/modules/@angular/platform-browser/tsconfig-es5.json b/modules/@angular/platform-browser/tsconfig-es5.json
index 399dfea56b..a851ef41dc 100644
--- a/modules/@angular/platform-browser/tsconfig-es5.json
+++ b/modules/@angular/platform-browser/tsconfig-es5.json
@@ -1,12 +1,8 @@
 {
-  "angularCompilerOptions": {
-    "skipTemplateCodegen": true
-  },
   "compilerOptions": {
     "baseUrl": ".",
     "declaration": true,
     "stripInternal": true,
-    "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "module": "commonjs",
     "moduleResolution": "node",
diff --git a/modules/@angular/platform-server/tsconfig-es2015.json b/modules/@angular/platform-server/tsconfig-es2015.json
index 18216e6d59..9526981fe1 100644
--- a/modules/@angular/platform-server/tsconfig-es2015.json
+++ b/modules/@angular/platform-server/tsconfig-es2015.json
@@ -1,12 +1,8 @@
 {
-  "angularCompilerOptions": {
-    "skipTemplateCodegen": true
-  },
   "compilerOptions": {
     "baseUrl": ".",
     "declaration": true,
     "stripInternal": true,
-    "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "module": "es2015",
     "moduleResolution": "node",
diff --git a/modules/@angular/platform-server/tsconfig-es5.json b/modules/@angular/platform-server/tsconfig-es5.json
index 1a5d04856c..d43cf9fc59 100644
--- a/modules/@angular/platform-server/tsconfig-es5.json
+++ b/modules/@angular/platform-server/tsconfig-es5.json
@@ -1,12 +1,8 @@
 {
-  "angularCompilerOptions": {
-    "skipTemplateCodegen": true
-  },
   "compilerOptions": {
     "baseUrl": ".",
     "declaration": true,
     "stripInternal": true,
-    "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "module": "commonjs",
     "moduleResolution": "node",
diff --git a/modules/@angular/router-deprecated/src/lifecycle/lifecycle_annotations.ts b/modules/@angular/router-deprecated/src/lifecycle/lifecycle_annotations.ts
index 5741abfa96..c06f0da40b 100644
--- a/modules/@angular/router-deprecated/src/lifecycle/lifecycle_annotations.ts
+++ b/modules/@angular/router-deprecated/src/lifecycle/lifecycle_annotations.ts
@@ -36,6 +36,7 @@ export {routerCanDeactivate, routerCanReuse, routerOnActivate, routerOnDeactivat
  * ### Example
  *
  * {@example router/ts/can_activate/can_activate_example.ts region='canActivate' }
+ * @Annotation
  */
 export var CanActivate:
     (hook: (next: ComponentInstruction, prev: ComponentInstruction) => Promise<boolean>| boolean) =>
diff --git a/modules/@angular/router-deprecated/src/route_config/route_config_decorator.ts b/modules/@angular/router-deprecated/src/route_config/route_config_decorator.ts
index 38b0612a0d..e12559601f 100644
--- a/modules/@angular/router-deprecated/src/route_config/route_config_decorator.ts
+++ b/modules/@angular/router-deprecated/src/route_config/route_config_decorator.ts
@@ -10,6 +10,7 @@ export {AsyncRoute, AuxRoute, Redirect, Route, RouteDefinition} from './route_co
  * The `RouteConfig` decorator defines routes for a given component.
  *
  * It takes an array of {@link RouteDefinition}s.
+ * @Annotation
  */
 export var RouteConfig: (configs: RouteDefinition[]) => ClassDecorator =
     makeDecorator(RouteConfigAnnotation);
diff --git a/modules/@angular/router-deprecated/tsconfig-es2015.json b/modules/@angular/router-deprecated/tsconfig-es2015.json
index a9054ea4ba..a2fc2b654b 100644
--- a/modules/@angular/router-deprecated/tsconfig-es2015.json
+++ b/modules/@angular/router-deprecated/tsconfig-es2015.json
@@ -1,12 +1,8 @@
 {
-  "angularCompilerOptions": {
-    "skipTemplateCodegen": true
-  },
   "compilerOptions": {
     "baseUrl": ".",
     "declaration": true,
     "stripInternal": true,
-    "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "module": "es2015",
     "moduleResolution": "node",
diff --git a/modules/@angular/router-deprecated/tsconfig-es5.json b/modules/@angular/router-deprecated/tsconfig-es5.json
index 2ffc89573e..4ed590d890 100644
--- a/modules/@angular/router-deprecated/tsconfig-es5.json
+++ b/modules/@angular/router-deprecated/tsconfig-es5.json
@@ -1,12 +1,8 @@
 {
-  "angularCompilerOptions": {
-    "skipTemplateCodegen": true
-  },
   "compilerOptions": {
     "baseUrl": ".",
     "declaration": true,
     "stripInternal": true,
-    "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "module": "commonjs",
     "moduleResolution": "node",
diff --git a/modules/@angular/router/src/metadata/decorators.ts b/modules/@angular/router/src/metadata/decorators.ts
index 96b8a34a8e..73dfbf5eb7 100644
--- a/modules/@angular/router/src/metadata/decorators.ts
+++ b/modules/@angular/router/src/metadata/decorators.ts
@@ -17,5 +17,6 @@ export interface RoutesFactory {
  * Defines routes for a given component.
  *
  * It takes an array of {@link RouteMetadata}s.
+ * @Annotation
  */
 export var Routes: RoutesFactory = <RoutesFactory>makeDecorator(RoutesMetadata);
diff --git a/modules/@angular/router/tsconfig-es2015.json b/modules/@angular/router/tsconfig-es2015.json
index f084c718d0..de33e1360a 100644
--- a/modules/@angular/router/tsconfig-es2015.json
+++ b/modules/@angular/router/tsconfig-es2015.json
@@ -1,12 +1,8 @@
 {
-  "angularCompilerOptions": {
-    "skipTemplateCodegen": true
-  },
   "compilerOptions": {
     "baseUrl": ".",
     "declaration": true,
     "stripInternal": true,
-    "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "module": "es2015",
     "moduleResolution": "node",
diff --git a/modules/@angular/router/tsconfig-es5.json b/modules/@angular/router/tsconfig-es5.json
index 569be600e0..9c201f6c16 100644
--- a/modules/@angular/router/tsconfig-es5.json
+++ b/modules/@angular/router/tsconfig-es5.json
@@ -1,12 +1,8 @@
 {
-  "angularCompilerOptions": {
-    "skipTemplateCodegen": true
-  },
   "compilerOptions": {
     "baseUrl": ".",
     "declaration": true,
     "stripInternal": true,
-    "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "module": "commonjs",
     "moduleResolution": "node",
diff --git a/modules/@angular/upgrade/tsconfig-es2015.json b/modules/@angular/upgrade/tsconfig-es2015.json
index 883c6fcceb..9cff0e3641 100644
--- a/modules/@angular/upgrade/tsconfig-es2015.json
+++ b/modules/@angular/upgrade/tsconfig-es2015.json
@@ -1,12 +1,8 @@
 {
-  "angularCompilerOptions": {
-    "skipTemplateCodegen": true
-  },
   "compilerOptions": {
     "baseUrl": ".",
     "declaration": true,
     "stripInternal": true,
-    "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "module": "es2015",
     "moduleResolution": "node",
diff --git a/modules/@angular/upgrade/tsconfig-es5.json b/modules/@angular/upgrade/tsconfig-es5.json
index 381a51df61..da42c7e2bc 100644
--- a/modules/@angular/upgrade/tsconfig-es5.json
+++ b/modules/@angular/upgrade/tsconfig-es5.json
@@ -1,12 +1,8 @@
 {
-  "angularCompilerOptions": {
-    "skipTemplateCodegen": true
-  },
   "compilerOptions": {
     "baseUrl": ".",
     "declaration": true,
     "stripInternal": true,
-    "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "module": "commonjs",
     "moduleResolution": "node",
diff --git a/modules/tsconfig.json b/modules/tsconfig.json
index 47536dca30..97c5135d60 100644
--- a/modules/tsconfig.json
+++ b/modules/tsconfig.json
@@ -1,11 +1,7 @@
 {
-  "angularCompilerOptions": {
-    "skipTemplateCodegen": true
-  },
   "compilerOptions": {
     "baseUrl": ".",
     "declaration": true,
-    "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "module": "commonjs",
     "moduleResolution": "node",
diff --git a/npm-shrinkwrap.clean.json b/npm-shrinkwrap.clean.json
index 3ff6b4f5f9..25ddbd2bde 100644
--- a/npm-shrinkwrap.clean.json
+++ b/npm-shrinkwrap.clean.json
@@ -5203,7 +5203,7 @@
       }
     },
     "tsickle": {
-      "version": "0.1.4",
+      "version": "0.1.6",
       "dependencies": {
         "source-map": {
           "version": "0.4.4"
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 4be3634f4d..5b06efdd92 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -8293,8 +8293,8 @@
       }
     },
     "tsickle": {
-      "version": "0.1.4",
-      "from": "tsickle@0.1.4",
+      "version": "0.1.6",
+      "from": "tsickle@0.1.6",
       "dependencies": {
         "source-map": {
           "version": "0.4.4",
diff --git a/scripts/ci-lite/test_js.sh b/scripts/ci-lite/test_js.sh
index 66dfb7eb3f..a2d60810ac 100755
--- a/scripts/ci-lite/test_js.sh
+++ b/scripts/ci-lite/test_js.sh
@@ -33,8 +33,9 @@ echo 'travis_fold:end:test.unit.node'
 
 echo 'travis_fold:start:test.unit.localChrome'
 
-# rebuild to codegen files in @angular/compiler/test
-node dist/all/@angular/compiler-cli/src/main -p modules/tsconfig.json
+# rebuild to revert files in @angular/compiler/test
+# TODO(tbosch): remove this and teach karma to serve the right files
+node dist/tools/@angular/tsc-wrapped/src/main -p modules/tsconfig.json
 
 # Run unit tests in local chrome
 if [[ ${TRAVIS} ]]; then
diff --git a/tools/@angular/tsc-wrapped/package.json b/tools/@angular/tsc-wrapped/package.json
index 43d4fbdd48..8604fee3cd 100644
--- a/tools/@angular/tsc-wrapped/package.json
+++ b/tools/@angular/tsc-wrapped/package.json
@@ -11,7 +11,7 @@
   "license": "MIT",
   "repository": {"type":"git","url":"https://github.com/angular/angular.git"},
   "dependencies": {
-    "tsickle": "0.1.4"
+    "tsickle": "0.1.6"
   },
   "peerDependencies": {
     "typescript": "^1.9.0-dev"