diff --git a/firmware/drivers/ata.c b/firmware/drivers/ata.c
index 87dacc3ed0..1e42bed5af 100644
--- a/firmware/drivers/ata.c
+++ b/firmware/drivers/ata.c
@@ -71,7 +71,7 @@
 static struct thread_entry *ata_thread_p = NULL;
 #endif
 
-#if defined(MAX_PHYS_SECTOR_SIZE) && MEM == 64
+#if 0 /* defined(MAX_PHYS_SECTOR_SIZE) && MEM == 64 */
 /* Hack - what's the deal with 5g? */
 struct ata_lock
 {
diff --git a/firmware/thread.c b/firmware/thread.c
index 0f4273107f..e8d05d5305 100644
--- a/firmware/thread.c
+++ b/firmware/thread.c
@@ -161,7 +161,7 @@ void switch_thread(void)
  * Processor-specific section
  */
 
-#if defined(MAX_PHYS_SECTOR_SIZE) && MEM == 64
+#if 0 /* defined(MAX_PHYS_SECTOR_SIZE) && MEM == 64 */
 /* Support a special workaround object for large-sector disks */
 #define IF_NO_SKIP_YIELD(...) __VA_ARGS__
 #else