revert a few changes