diff --git a/src/syscall/process.rs b/src/syscall/process.rs
index dafb17b875550a43e85cf3d2daac6f0b7c8422ae..65c6a7f9641b70065feef4b9fd3abbb12758b01a 100644
--- a/src/syscall/process.rs
+++ b/src/syscall/process.rs
@@ -167,7 +167,7 @@ pub fn clone(flags: usize, stack_base: usize) -> Result<ContextId> {
                         let mut new_heap = context::memory::Memory::new(
                             VirtualAddress::new(::USER_TMP_HEAP_OFFSET),
                             heap.size(),
-                            EntryFlags::PRESENT | /* TODO: Hack for mesa: EntryFlags::NO_EXECUTE | */ EntryFlags::WRITABLE,
+                            EntryFlags::PRESENT | EntryFlags::NO_EXECUTE | EntryFlags::WRITABLE,
                             false
                         );
 
@@ -639,7 +639,7 @@ fn fexec_noreturn(
             context.heap = Some(context::memory::Memory::new(
                 VirtualAddress::new(::USER_HEAP_OFFSET),
                 0,
-                /* TODO: Hack for mesa: EntryFlags::NO_EXECUTE | */ EntryFlags::WRITABLE | EntryFlags::USER_ACCESSIBLE,
+                EntryFlags::NO_EXECUTE | EntryFlags::WRITABLE | EntryFlags::USER_ACCESSIBLE,
                 true
             ).to_shared());