diff --git a/subversion/libsvn_fs_fs/fs_fs.c b/subversion/libsvn_fs_fs/fs_fs.c
index 9e74358..0d06112 100644
--- a/subversion/libsvn_fs_fs/fs_fs.c
+++ b/subversion/libsvn_fs_fs/fs_fs.c
@@ -8273,13 +8273,12 @@
                                             svn_revnum_t new_rev,
                                             apr_pool_t *pool)
 {
+#ifdef SVN_DEBUG
   fs_fs_data_t *ffd = fs->fsap_data;
   svn_fs_t *ft; /* fs++ == ft */
   svn_fs_root_t *root;
   fs_fs_data_t *ft_ffd;
 
-  /* ### TODO: make this logic conditional */
-
   SVN_ERR_ASSERT(ffd->svn_fs_open_);
 
   SVN_ERR(ffd->svn_fs_open_(&ft, fs->path,
@@ -8294,6 +8293,7 @@
   SVN_ERR_ASSERT(root->is_txn_root == FALSE && root->rev == new_rev);
   SVN_ERR_ASSERT(ft_ffd->youngest_rev_cache == new_rev);
   SVN_ERR(svn_fs_fs__verify_root(root, pool));
+#endif /* SVN_DEBUG */
 
   return SVN_NO_ERROR;
 }