diff --git a/docs/dgeni-package/templates/angular2/angular2.d.ts.template.html b/docs/dgeni-package/templates/angular2/angular2.d.ts.template.html
index f902e923ce4882..a8332d7d5ce2f8 100644
--- a/docs/dgeni-package/templates/angular2/angular2.d.ts.template.html
+++ b/docs/dgeni-package/templates/angular2/angular2.d.ts.template.html
@@ -9,7 +9,6 @@
 interface List<T> extends Array<T> {}
 interface Map<K,V> {}
 interface StringMap<K,V> extends Map<K,V> {}
-declare type Type = ng.Type;
 
 declare module ng {
   type SetterFn = typeof Function;
diff --git a/docs/dgeni-package/templates/type-definition.template.html b/docs/dgeni-package/templates/type-definition.template.html
index 6c0f2c0c64ccc2..4ebceffaa00369 100644
--- a/docs/dgeni-package/templates/type-definition.template.html
+++ b/docs/dgeni-package/templates/type-definition.template.html
@@ -13,8 +13,7 @@
      {$ member.name $}{% if member.optional %}?{% endif -%}
 {% if member.typeParameters %}<{% for typeParam in member.typeParameters %}{$ typeParam $}{% if not loop.last %}, {% endif %}{% endfor %}>{% endif -%}
 {%- if member.parameters -%}({% for param in member.parameters %}{$ param $}{% if not loop.last %}, {% endif %}{% endfor %}){%- endif -%}
-{%- if member.returnType -%}
-  : {$ member.returnType $}{%- else -%}: void
+{%- if member.returnType == 'Directive' %}: DirectiveAnnotation{%- elif member.returnType -%}: {$ member.returnType $}{%- else -%}: void
 {%- endif -%};
 {%- endmacro -%}
 
@@ -38,7 +37,7 @@
   {%- if export.content -%}
     {$ commentBlock(export, 3) $}
   {%- endif %}
-  {$ export.docType $} {$ export.name $}{$ export.typeParams $}{$ export.heritage $}
+  {$ export.docType $} {$ export.name $}{$ export.typeParams $}{%- if export.heritage == ' extends Directive' %} extends DirectiveAnnotation{% else %}{$ export.heritage $}{% endif %}
   {%- if export.docType == 'class' or export.docType == 'interface' %} {
   {%- if export.newMember %}
     {$ memberInfo(export.newMember) $}
diff --git a/modules/angular2/angular2.api.ts b/modules/angular2/angular2.api.ts
index ba4c75782054fd..9bc678bac5c0b5 100644
--- a/modules/angular2/angular2.api.ts
+++ b/modules/angular2/angular2.api.ts
@@ -11,13 +11,9 @@ export * from './angular2';
 // 1) if the symbol is intended to be part of the public API, then re-export somewhere else
 // 2) if the symbol should be omitted from the public API, then the class exposing it should
 //    not be exported, or should avoid exposing the symbol.
-export {ProtoRecord, RecordType} from './src/change_detection/proto_record';
 export * from './src/core/compiler/element_injector';
 export {DependencyAnnotation} from './src/di/annotations_impl';
-// FIXME: this is a workaround for https://github.com/angular/angular/issues/2356
-// We export the Directive *annotation* instead of the *decorator*.
-// But it breaks the build.
-export {Directive, LifecycleEvent} from './src/core/annotations_impl/annotations';
+export {LifecycleEvent} from './src/core/annotations_impl/annotations';
 export {Form} from './src/forms/directives/form_interface';
 export {TypeDecorator, ClassDefinition} from './src/util/decorators';
 export {Query} from './src/core/annotations_impl/di';