[CA-136072] Revert to latest set of tools