Switched over to using the ContainerAwareRouter.