revert some more changes