diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c
index e18581082..64deefc39 100644
--- a/src/machine/machine_table.c
+++ b/src/machine/machine_table.c
@@ -4457,7 +4457,7 @@ const machine_t machines[] = {
         .net_device = NULL
     },
             {
-        .name = "[ALI M1409] Acer 100T",
+        .name = "[ALi M1409] Acer 100T",
         .internal_name = "acer100t",
         .type = MACHINE_TYPE_386SX,
         .chipset = MACHINE_CHIPSET_ALI_M1409,
@@ -14462,7 +14462,7 @@ const machine_t machines[] = {
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = NULL,
-        .snd_device = &cs4235_device,
+        .snd_device = &cs4235_onboard_device,
         .net_device = NULL
     },
 
diff --git a/src/sound/snd_cs423x.c b/src/sound/snd_cs423x.c
index 17ea48dd3..74382a53b 100644
--- a/src/sound/snd_cs423x.c
+++ b/src/sound/snd_cs423x.c
@@ -650,15 +650,7 @@ cs423x_pnp_enable(cs423x_t *dev, uint8_t update_rom, uint8_t update_hwconfig)
             isapnp_update_card_rom(dev->pnp_card, &dev->ram_data[dev->pnp_offset], dev->pnp_size);
 
         /* Disable PnP key if the PKD bit is set, or if it was disabled by command 0x55. */
-        /* But wait! The TriGem Delhi-III BIOS sends command 0x55, and its behavior doesn't
-           line up with real hardware (still listed in the POST summary and seen by software).
-           Disable the PnP key disabling mechanism until someone figures something out. */
-#if 0
         isapnp_enable_card(dev->pnp_card, ((dev->ram_data[0x4002] & 0x20) || !dev->pnp_enable) ? ISAPNP_CARD_NO_KEY : ISAPNP_CARD_ENABLE);
-#else
-        if ((dev->ram_data[0x4002] & 0x20) || !dev->pnp_enable)
-            pclog("CS423x: Attempted to disable PnP key\n");
-#endif
     }
 
     /* Update some register bits based on the config data in RAM if requested. */