diff --git a/src/chipset/intel_82335.c b/src/chipset/intel_82335.c
index 661454232..f8b145bb8 100644
--- a/src/chipset/intel_82335.c
+++ b/src/chipset/intel_82335.c
@@ -163,6 +163,10 @@ intel_82335_init(const device_t *info)
     intel_82335_t *dev = (intel_82335_t *) malloc(sizeof(intel_82335_t));
     memset(dev, 0, sizeof(intel_82335_t));
 
+    memset(dev->regs, 0, sizeof(dev->regs));
+
+    dev->regs[0x28] = 0xf9;
+
     dev->cfg_locked = 0;
 
     /* Memory Configuration */
@@ -182,12 +186,6 @@ intel_82335_init(const device_t *info)
     /* Extended Granularity */
 	io_sethandler(0x002e, 0x0001, NULL, intel_82335_read, NULL, NULL, intel_82335_write, NULL, dev);
     
-    /* Default Programming(Fixes Shadowing failures on the ADI 386SX) */
-    for(uint16_t i=0x0022; i<0x002f; i=i+0x0002)
-    intel_82335_write(i, 0x0000, dev);
-
-    intel_82335_write(0x0028, 0x00f9, dev);
-
     return dev;
 }