Remove workaround for flawed @AssociatedResources now it works OK