diff -u -r -U5 -N git-annex-3.20120522/Common.hs git-annex-3.20120522.no-ifelse/Common.hs
--- git-annex-3.20120522/Common.hs	2012-05-22 11:28:25.000000000 -0400
+++ git-annex-3.20120522.no-ifelse/Common.hs	2012-06-02 09:44:55.941168737 -0400
@@ -1,9 +1,8 @@
 module Common (module X) where
 
 import Control.Monad as X hiding (join)
-import Control.Monad.IfElse as X
 import Control.Applicative as X
 import Control.Monad.State.Strict as X (liftIO)
 import Control.Exception.Extensible as X (IOException)
 
 import Data.Maybe as X
@@ -25,7 +24,8 @@
 import Utility.SafeCommand as X
 import Utility.Path as X
 import Utility.Directory as X
 import Utility.Monad as X
 import Utility.FileSystemEncoding as X
+import Utility.Conditional as X
 
 import Utility.PartialPrelude as X
diff -u joeyh-git-annex-6895a6e/git-annex.cabal.no-ifelse joeyh-git-annex-6895a6e/git-annex.cabal
--- joeyh-git-annex-6895a6e/git-annex.cabal.no-ifelse	2012-06-01 12:33:41.000000000 +0900
+++ joeyh-git-annex-6895a6e/git-annex.cabal	2012-06-26 13:26:56.398051874 +0900
@@ -35,7 +35,7 @@
    unix, containers, utf8-string, network, mtl, bytestring, old-locale, time,
    pcre-light, extensible-exceptions, dataenc, SHA, process, json, HTTP,
    base < 5, monad-control, transformers-base, lifted-base,
-   IfElse, text, QuickCheck >= 2.1, bloomfilter, edit-distance
+   text, QuickCheck >= 2.1, bloomfilter, edit-distance
   Other-Modules: Utility.Touch
   C-Sources: Utility/libdiskfree.c
   Extensions: CPP
diff -u -r -U5 -N git-annex-3.20120522/Utility/Conditional.hs git-annex-3.20120522.no-ifelse/Utility/Conditional.hs
--- git-annex-3.20120522/Utility/Conditional.hs	1969-12-31 19:00:00.000000000 -0500
+++ git-annex-3.20120522.no-ifelse/Utility/Conditional.hs	2012-06-02 09:44:55.942168737 -0400
@@ -0,0 +1,16 @@
+{- monadic conditional operators
+ -
+ - Copyright 2011 Joey Hess <joey@kitenet.net>
+ -
+ - Licensed under the GNU GPL version 3 or higher.
+ -}
+
+module Utility.Conditional where
+
+import Control.Monad (when, unless)
+
+whenM :: Monad m => m Bool -> m () -> m ()
+whenM c a = c >>= flip when a
+
+unlessM :: Monad m => m Bool -> m () -> m ()
+unlessM c a = c >>= flip unless a
diff -up joeyh-git-annex-6895a6e/Utility/Directory.hs~ joeyh-git-annex-6895a6e/Utility/Directory.hs
--- joeyh-git-annex-6895a6e/Utility/Directory.hs~	2012-06-01 12:33:41.000000000 +0900
+++ joeyh-git-annex-6895a6e/Utility/Directory.hs	2012-06-26 13:17:05.177416437 +0900
@@ -12,7 +12,6 @@ import System.Posix.Files
 import System.Directory
 import Control.Exception (throw)
 import Control.Monad
-import Control.Monad.IfElse
 import System.FilePath
 import Control.Applicative
 import Control.Exception (bracket_)
@@ -24,6 +23,7 @@ import Utility.TempFile
 import Utility.Exception
 import Utility.Monad
 import Utility.Path
+import Utility.Conditional
 
 dirCruft :: FilePath -> Bool
 dirCruft "." = True