More rollbacks to fix jar mismatch in repos