diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/extended-repository-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/extended-repository-context.xml
index c0fb9ec36d..2b10615154 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/extended-repository-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/extended-repository-context.xml
@@ -145,8 +145,7 @@
    <!-- Action Service -->
    <bean id="actionService" class="org.alfresco.repo.action.ExtendedActionServiceImpl" init-method="init">
 
-        <!-- The following reference injection has been commented out to address MNT-14900; dependency is resolved internally. -->
-        <!-- <property name="filePlanService" ref="FilePlanService" /> -->
+   		<property name="filePlanService" ref="FilePlanService" />
 
         <property name="policyComponent">
             <ref bean="policyComponent" />
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
index ad4a1a7ac9..6de002f343 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
@@ -501,8 +501,7 @@
         <property name="authorityService" ref="AuthorityService"/>
         <property name="permissionService" ref="PermissionService"/>
         <property name="nodeService" ref="NodeService"/>
-        <!-- The following reference injection has been commented out to address MNT-14900; dependency is resolved internally. -->
-        <!-- <property name="filePlanService" ref="FilePlanService" /> -->
+        <property name="filePlanService" ref="FilePlanService" />
         <!-- init repo for when a tenant is created -->
         <property name="bootstrapImporterModuleComponent" ref="org_alfresco_module_rm_bootstrapData"/>
 
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/role/FilePlanRoleServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/role/FilePlanRoleServiceImpl.java
index 1000908aca..2ef8b753d8 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/role/FilePlanRoleServiceImpl.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/role/FilePlanRoleServiceImpl.java
@@ -53,9 +53,6 @@ import org.apache.commons.lang.StringUtils;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.springframework.beans.BeansException;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
 import org.springframework.extensions.surf.util.I18NUtil;
 
 /**
@@ -65,8 +62,7 @@ import org.springframework.extensions.surf.util.I18NUtil;
  * @since 2.1
  */
 public class FilePlanRoleServiceImpl implements FilePlanRoleService,
-                                                RecordsManagementModel,
-                                                ApplicationContextAware
+                                                RecordsManagementModel
 {
     /** I18N */
     private static final String MSG_ALL_ROLES = "rm.role.all";
@@ -97,8 +93,6 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService,
 
     private BootstrapImporterModuleComponent bootstrapImporterModule;
 
-    private ApplicationContext applicationContext;
-
     /** Records management role zone */
     public static final String RM_ROLE_ZONE_PREFIX = "rmRoleZone";
 
@@ -153,16 +147,6 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService,
     {
         this.bootstrapImporterModule = bootstrapImporterModuleComponent;
     }
-    
-    protected FilePlanService getFilePlanService()
-    {
-        if (filePlanService == null)
-        {
-            filePlanService = (FilePlanService) applicationContext.getBean("FilePlanService");
-        }
-
-        return filePlanService;
-    }
 
     /**
      * @see org.alfresco.module.org_alfresco_module_rm.role.FilePlanRoleService#initialiseFilePlan(org.alfresco.service.cmr.repository.NodeRef)
@@ -206,11 +190,11 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService,
                     permissionService.setPermission(filePlan, ExtendedWriterDynamicAuthority.EXTENDED_WRITER, RMPermissionModel.FILING, true);
 
                     // Create the transfer and hold containers
-                    systemContainers.add(getFilePlanService().createHoldContainer(filePlan));
-                    systemContainers.add(getFilePlanService().createTransferContainer(filePlan));
+                    systemContainers.add(filePlanService.createHoldContainer(filePlan));
+                    systemContainers.add(filePlanService.createTransferContainer(filePlan));
 
                     // Create the unfiled record container
-                    systemContainers.add(getFilePlanService().createUnfiledContainer(filePlan));
+                    systemContainers.add(filePlanService.createUnfiledContainer(filePlan));
 
                     return systemContainers;
                 }
@@ -893,10 +877,4 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService,
     {
         return authorityService.getName(AuthorityType.GROUP, getAllRolesGroupShortName(filePlan));
     }
-
-    @Override
-    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException
-    {
-        this.applicationContext = applicationContext;
-    }
 }
diff --git a/rm-server/source/java/org/alfresco/repo/action/ExtendedActionServiceImpl.java b/rm-server/source/java/org/alfresco/repo/action/ExtendedActionServiceImpl.java
index 35225914d9..4d6d313465 100644
--- a/rm-server/source/java/org/alfresco/repo/action/ExtendedActionServiceImpl.java
+++ b/rm-server/source/java/org/alfresco/repo/action/ExtendedActionServiceImpl.java
@@ -46,16 +46,6 @@ public class ExtendedActionServiceImpl extends ActionServiceImpl implements Appl
     /** Application context */
     private ApplicationContext extendedApplicationContext;
 
-    protected FilePlanService getFilePlanService()
-    {
-        if (filePlanService == null)
-        {
-            filePlanService = (FilePlanService) extendedApplicationContext.getBean("FilePlanService");
-        }
-
-        return filePlanService;
-    }
-    
     /**
      * @see org.alfresco.repo.action.ActionServiceImpl#setApplicationContext(org.springframework.context.ApplicationContext)
      */
@@ -108,7 +98,7 @@ public class ExtendedActionServiceImpl extends ActionServiceImpl implements Appl
         else
         {
             // get the file component kind of the node reference
-            FilePlanComponentKind kind = getFilePlanService().getFilePlanComponentKind(nodeRef);
+            FilePlanComponentKind kind = filePlanService.getFilePlanComponentKind(nodeRef);
             result = new ArrayList<ActionDefinition>(actionDefinitions.size());
 
             // check each action definition