revert even more emotes, save a few