diff --git a/Makefile b/Makefile
index 44d7778e1..365a25ca8 100644
--- a/Makefile
+++ b/Makefile
@@ -56,7 +56,6 @@ CORE_MAINTAINER?=	franco@opnsense.org
 CORE_WWW?=		https://opnsense.org/
 CORE_MESSAGE?=		ACME delivery for the crafty coyote!
 CORE_DEPENDS?=		apinger \
-			ataidle \
 			beep \
 			bind910 \
 			bsdinstaller \
diff --git a/src/etc/rc b/src/etc/rc
index 87a400c39..0ee65f2eb 100755
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -88,21 +88,6 @@ if [ ! -f /usr/local/openssl/openssl.cnf ]; then
 	echo "done."
 fi
 
-# Disable APM on ATA drives.  Leaving this on will kill
-# drives long-term, especially laptop drives, by generating
-# excessive load cycles.
-ATAIDLE=/usr/local/sbin/ataidle
-for i in /dev/ad?; do
-	if [ ! -e ${i} ]; then
-		continue;
-	fi
-	SUPPORTED=`${ATAIDLE} ${i} | grep "APM Supported" | awk '{print $3;}'`
-	if [ "${SUPPORTED}" = "yes" ] ; then
-		echo Disabling APM on $i
-		${ATAIDLE} -P 0 ${i}
-	fi
-done
-
 #Eject CD devices on 3G modems
 MANUFACTURER="huawei|zte"
 CDDEVICE=`dmesg |egrep -ie "($MANUFACTURER)" | awk -F: '/cd/ {print $1}'`