Bug 985837: Remove workaround for emulator-kk, since it seems to be working. r=aki