Remove dependency on "is emulator"