revert some changes that broke EVS