Revert a few things