BUG:  Fix Tim's testing problem.  Put the Mac workaround in an #ifdef, and
      restore code that worked on Windows and Linux.