oops.  backing out a bad refactoring.