Revert some unnecessary changes.