Revert "Improve roles"

This reverts commit 7ea45766

.

This blocks our integration into qt5.git for now as we would need to update qtbase as well and prevent us from pushing build fixes beyond this change.

Let's get it in again after the alpha.

Change-Id: Ie57c99dd91fc19ae2695f8d881a0a8318e988806
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>