moving original patch to master

This reverts commit 809d6b96be8842c854364f7e4181ee3bc15e495d

Change-Id: If875d22f8dad93d40be7a12e3fe3b308d6cafb8e
Reviewed-by: Eike Ziller <eike.ziller@digia.com>