Revert "work-around conflicting imports"

This has been fixed properly by 201e19017b9538c3d915ed934df5bcb30027a2da.

This reverts commit f64bf71f4eb430e98bdf0cfc8245be893c277b23

Change-Id: I561800e120bc740feee170c6ec78fbd84505b8ac
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>