Revert my accidental clobbering last night of some of my changes.