diff --git a/src/memory.rs b/src/memory.rs
index b99dae15970..14aa4f9d799 100644
--- a/src/memory.rs
+++ b/src/memory.rs
@@ -102,8 +102,9 @@ impl Memory {
             alloc_map: HashMap::new(),
             next_id: AllocId(0),
 
-            // TODO(tsion): Should this be host's or target's usize?
-            pointer_size: mem::size_of::<usize>(),
+            // FIXME(tsion): This should work for both 4 and 8, but it currently breaks some things
+            // when set to 4.
+            pointer_size: 8,
         }
     }