Remove key-manager-listener dependency.