revert a couple things