backed out a couple changes

backed out some changes doing testing that had been checked in.