Reverts the revert that was needed for 2.7.
This reverts commit 3110c28cc1.
Change-Id: If7f4d22f3d339842e6a5846e2edb99e2c961a794
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
That shouldn't have gone into 2.7...
This reverts commit 4647cb77d3.
Change-Id: I4abfc8120d7c3d5a6b9e11d212f955cd66ba01a5
Reviewed-by: Eike Ziller <eike.ziller@digia.com>