Revert most changes except for objective counts