This function was added in a previous patch, so reuse it
for already existing code.

Change-Id: Icd5daf195af7e249d4273bbc32a290bed5f0eaa5
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>