Revert previous patch; service_identity has too many subdependencies.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Suppress warning about service_identity. fixes #2248

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