Revert a few more changes