Re-added the old fix for the "automatically starting emulator" bug that
got removed during refactoring.