diff --git a/cores/esp32/Esp.h b/cores/esp32/Esp.h
index 81684836..34ddb3bd 100644
--- a/cores/esp32/Esp.h
+++ b/cores/esp32/Esp.h
@@ -22,9 +22,7 @@
 
 #include <Arduino.h>
 #include <esp_partition.h>
-#ifndef CONFIG_IDF_TARGET_ESP32 // Broken in IDF 20210417
-#include <hal/systimer_hal.h>
-#endif
+#include <hal/cpu_hal.h>
 
 /**
  * AVR macros for WDT managment
@@ -113,13 +111,7 @@ public:
 
 uint32_t ARDUINO_ISR_ATTR EspClass::getCycleCount()
 {
-    uint32_t ccount;
-#ifdef CONFIG_IDF_TARGET_ESP32
-    __asm__ __volatile__("esync; rsr %0,ccount":"=a" (ccount));
-#else // This should work on ESP32 once the hal is complete
-    ccount = systimer_hal_get_counter_value(SYSTIMER_COUNTER_0);
-#endif
-    return ccount;
+    return cpu_hal_get_cycle_count();
 }
 
 extern EspClass ESP;