Revert previous patch; service_identity has too many subdependencies.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>