diff --git a/accessible/base/nsAccessibilityService.cpp b/accessible/base/nsAccessibilityService.cpp
index f98aa29894d2..bec7be36973b 100644
--- a/accessible/base/nsAccessibilityService.cpp
+++ b/accessible/base/nsAccessibilityService.cpp
@@ -1055,13 +1055,13 @@ nsAccessibilityService::GetOrCreateAccessible(nsINode* aNode,
         // A graphic elements: rect, circle, ellipse, line, path, polygon,
         // polyline and image. A 'use' and 'text' graphic elements require
         // special support.
-        newAcc = new EnumRoleAccessible(content, document, roles::GRAPHIC);
+        newAcc = new RoleTAccessible<roles::GRAPHIC>(content, document);
       } else if (content->IsSVGElement(nsGkAtoms::svg)) {
-        newAcc = new EnumRoleAccessible(content, document, roles::DIAGRAM);
+        newAcc = new RoleTAccessible<roles::DIAGRAM>(content, document);
       }
     } else if (content->IsMathMLElement()) {
       if (content->IsMathMLElement(nsGkAtoms::math))
-        newAcc = new EnumRoleAccessible(content, document, roles::EQUATION);
+        newAcc = new RoleTAccessible<roles::EQUATION>(content, document);
       else
         newAcc = new HyperTextAccessible(content, document);
     }
@@ -1307,14 +1307,14 @@ nsAccessibilityService::CreateAccessibleByType(nsIContent* aContent,
     accessible = new XULMenuSeparatorAccessible(aContent, aDoc);
 
   } else if(role.EqualsLiteral("xul:pane")) {
-    accessible = new EnumRoleAccessible(aContent, aDoc, roles::PANE);
+    accessible = new RoleTAccessible<roles::PANE>(aContent, aDoc);
 
   } else if (role.EqualsLiteral("xul:panel")) {
     if (aContent->AttrValueIs(kNameSpaceID_None, nsGkAtoms::noautofocus,
                               nsGkAtoms::_true, eCaseMatters))
       accessible = new XULAlertAccessible(aContent, aDoc);
     else
-      accessible = new EnumRoleAccessible(aContent, aDoc, roles::PANE);
+      accessible = new RoleTAccessible<roles::PANE>(aContent, aDoc);
 
   } else if (role.EqualsLiteral("xul:progressmeter")) {
     accessible = new XULProgressMeterAccessible(aContent, aDoc);
@@ -1341,7 +1341,7 @@ nsAccessibilityService::CreateAccessibleByType(nsIContent* aContent,
     accessible = new XULLabelAccessible(aContent, aDoc);
 
   } else if (role.EqualsLiteral("xul:textbox")) {
-    accessible = new EnumRoleAccessible(aContent, aDoc, roles::SECTION);
+    accessible = new RoleTAccessible<roles::SECTION>(aContent, aDoc);
 
   } else if (role.EqualsLiteral("xul:thumb")) {
     accessible = new XULThumbAccessible(aContent, aDoc);
@@ -1567,7 +1567,7 @@ nsAccessibilityService::CreateAccessibleByFrameType(nsIFrame* aFrame,
       newAcc = new HTMLSelectListAccessible(aContent, document);
       break;
     case eHTMLMediaType:
-      newAcc = new EnumRoleAccessible(aContent, document, roles::GROUPING);
+      newAcc = new RoleTAccessible<roles::GROUPING>(aContent, document);
       break;
     case eHTMLRadioButtonType:
       newAcc = new HTMLRadioButtonAccessible(aContent, document);
diff --git a/accessible/generic/BaseAccessibles.cpp b/accessible/generic/BaseAccessibles.cpp
index 5afd665dcf1c..7e7ce896cf07 100644
--- a/accessible/generic/BaseAccessibles.cpp
+++ b/accessible/generic/BaseAccessibles.cpp
@@ -226,24 +226,6 @@ LinkableAccessible::UnbindFromParent()
   AccessibleWrap::UnbindFromParent();
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// EnumRoleAccessible
-////////////////////////////////////////////////////////////////////////////////
-
-EnumRoleAccessible::
-  EnumRoleAccessible(nsIContent* aNode, DocAccessible* aDoc, roles::Role aRole) :
-  AccessibleWrap(aNode, aDoc), mRole(aRole)
-{
-}
-
-NS_IMPL_ISUPPORTS_INHERITED0(EnumRoleAccessible, Accessible)
-
-role
-EnumRoleAccessible::NativeRole()
-{
-  return mRole;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // DummyAccessible
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/accessible/generic/BaseAccessibles.h b/accessible/generic/BaseAccessibles.h
index 1ba6c9febbe6..cf427438c240 100644
--- a/accessible/generic/BaseAccessibles.h
+++ b/accessible/generic/BaseAccessibles.h
@@ -91,23 +91,23 @@ protected:
 };
 
 /**
- * A simple accessible that gets its enumerated role passed into constructor.
+ * A simple accessible that gets its enumerated role.
  */
-class EnumRoleAccessible : public AccessibleWrap
+template<a11y::role R>
+class RoleTAccessible : public AccessibleWrap
 {
 public:
-  EnumRoleAccessible(nsIContent* aContent, DocAccessible* aDoc, 
-                     a11y::role aRole);
+  RoleTAccessible(nsIContent* aContent, DocAccessible* aDoc) :
+    AccessibleWrap(aContent, aDoc) { }
 
-  NS_DECL_ISUPPORTS_INHERITED
+  NS_IMETHOD QueryInterface(REFNSIID aIID, void** aPtr) MOZ_OVERRIDE
+    { return Accessible::QueryInterface(aIID, aPtr); }
 
   // Accessible
-  virtual a11y::role NativeRole() MOZ_OVERRIDE;
+  virtual a11y::role NativeRole() MOZ_OVERRIDE { return R; }
 
 protected:
-  virtual ~EnumRoleAccessible() { }
-
-  a11y::role mRole;
+  virtual ~RoleTAccessible() { }
 };