This reverts commit b8ae74d78a.
Reason for revert: Emulator startup issue is fixed now with
86a655387c26cd25dde69cebd18b5ff9379fbe3e.
Change-Id: Id5d8f4db7bfcf194076385c6271bb324c126e268
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit c657dbee63)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>