revert a few spurious changes