diff --git a/arch/arm64/kernel/include/syscall_list.h b/arch/arm64/kernel/include/syscall_list.h
index 850d3635..19f286c6 100644
--- a/arch/arm64/kernel/include/syscall_list.h
+++ b/arch/arm64/kernel/include/syscall_list.h
@@ -142,4 +142,3 @@ SYSCALL_HANDLED(1045, signalfd)
 SYSCALL_DELEGATED(1049, stat)
 SYSCALL_DELEGATED(1060, getpgrp)
 SYSCALL_HANDLED(1062, time)
-SYSCALL_DELEGATED(1069, epoll_wait)
diff --git a/kernel/syscall.c b/kernel/syscall.c
index 7e2c793d..01c06749 100644
--- a/kernel/syscall.c
+++ b/kernel/syscall.c
@@ -242,10 +242,6 @@ long do_syscall(struct syscall_request *req, int cpu)
 			unsigned long flags;
 			DECLARE_WAITQ_ENTRY(scd_wq_entry, cpu_local_var(current));
 
-			if (req->number == __NR_epoll_wait ||
-				req->number == __NR_epoll_pwait)
-				goto schedule;
-
 			cpu_pause();
 
 			/* Spin if not preemptable */
@@ -274,7 +270,6 @@ long do_syscall(struct syscall_request *req, int cpu)
 				continue;
 			}
 
-schedule:
 			flags = cpu_disable_interrupt_save();
 
 			/* Try to sleep until notified */