diff --git a/src/search.cpp b/src/search.cpp
index be300cd9..975a2fcc 100644
--- a/src/search.cpp
+++ b/src/search.cpp
@@ -850,7 +850,7 @@ namespace {
 
     // If we are pondering or in infinite search, we shouldn't print the
     // best move before we are told to do so.
-    if (!AbortSearch && !ExactMaxTime && (PonderSearch || InfiniteSearch))
+    if (!AbortSearch && (PonderSearch || InfiniteSearch))
         wait_for_stop_or_ponderhit();
     else
         // Print final search statistics
diff --git a/src/uci.cpp b/src/uci.cpp
index 1ab0aedf..da17e825 100644
--- a/src/uci.cpp
+++ b/src/uci.cpp
@@ -298,9 +298,6 @@ namespace {
         }
     }
 
-    if (moveTime)
-        infinite = true;  // HACK
-
     assert(RootPosition.is_ok());
 
     return think(RootPosition, infinite, ponder, RootPosition.side_to_move(),