diff --git a/tmk_core/common/wait.h b/tmk_core/common/wait.h
index 553f5243..a7cded94 100644
--- a/tmk_core/common/wait.h
+++ b/tmk_core/common/wait.h
@@ -13,13 +13,8 @@ extern "C" {
 #   define wait_us(us)  _delay_us(us)
 #elif defined PROTOCOL_CHIBIOS
 #   include "ch.h"
-#   if defined(STM32F3xx_MCUCONF)
-#       define wait_ms(ms) chSysPolledDelayX(MS2RTC(STM32_HCLK, (ms)))
-#       define wait_us(us) chSysPolledDelayX(US2RTC(STM32_HCLK, (us)))
-#   else
-#       define wait_ms(ms) chThdSleepMilliseconds(ms)
-#       define wait_us(us) chThdSleepMicroseconds(us)
-#   endif
+#   define wait_ms(ms) chThdSleepMilliseconds(ms)
+#   define wait_us(us) chThdSleepMicroseconds(us)
 #elif defined(__arm__)
 #   include "wait_api.h"
 #else  // Unit tests