diff --git a/checkin_notes b/checkin_notes
index 8f8dfc4eef..a7e2bda0c3 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -8201,3 +8201,13 @@ David  21 June 2005
         boinc_db.C
     sched/
         handle_request.C
+
+David  21 June 2005
+    - core client: round-robin simulator wasn't excluding
+        non-CPU-intensive projects
+        (from John McLeod)
+    - scheduler: comment out transaction stuff.
+        It's not clear what this does, or if we want it.
+
+    client/
+        cs_scheduler.C
diff --git a/client/cs_scheduler.C b/client/cs_scheduler.C
index eae2b440c6..8e56e9e6eb 100644
--- a/client/cs_scheduler.C
+++ b/client/cs_scheduler.C
@@ -1022,6 +1022,7 @@ bool CLIENT_STATE::rr_misses_deadline(double per_cpu_proc_rate, double rrs) {
     for (i=0; i<results.size(); i++) {
         rp = results[i];
         if (!rp->runnable()) continue;
+        if (rp->project->non_cpu_intensive) continue;
         rp->rrsim_cpu_left = rp->estimated_cpu_time_remaining();
         p = rp->project;
         if (p->active.size() < (unsigned int)ncpus) {
diff --git a/sched/handle_request.C b/sched/handle_request.C
index c498d08639..0138f752dc 100644
--- a/sched/handle_request.C
+++ b/sched/handle_request.C
@@ -633,6 +633,7 @@ int handle_results(SCHEDULER_REQUEST& sreq, SCHEDULER_REPLY& reply) {
     } // loop over all incoming results
 
 
+#if 0
     if (config.use_transactions) {
         retval = boinc_db.start_transaction();
         if (retval) {
@@ -642,6 +643,7 @@ int handle_results(SCHEDULER_REQUEST& sreq, SCHEDULER_REPLY& reply) {
             );
         }
     }
+#endif
 
     // Update the result records
     // (skip items that we previously marked to skip)
@@ -670,6 +672,7 @@ int handle_results(SCHEDULER_REQUEST& sreq, SCHEDULER_REPLY& reply) {
         );
     }
 
+#if 0
     if (config.use_transactions) {
         retval = boinc_db.commit_transaction();
         if (retval) {
@@ -680,6 +683,7 @@ int handle_results(SCHEDULER_REQUEST& sreq, SCHEDULER_REPLY& reply) {
             );
         }
     }
+#endif
     return 0;
 }