reverting some additions and removing some reverts