Reverted because a dependent commit broke compilation

Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
(cherry picked from commit a53cc559)

Change-Id: I8de3dbeca7eed3815eb5f0843eba6a86d371675e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>