This reverts commit 2d77922856.
Reason for revert: This causes a build error in Android tests, reverting until the a fix is ready for that to not block the repo.
Change-Id: I74961df660ebaf69caf092d53172821815f21268
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>