Revert two fixes. Suggested by palmieri@math.washington.edu (John H. Palmieri).