Revert a few more changes (minor)