This is now (additionally) on a per-entry level, resulting
in less duplication.

Change-Id: Ia93547396384fe5b421c4b601b52476a23cdfa89
Reviewed-by: hjk <hjk121@nokiamail.com>