Revert "update Jeff's code revision of hhcap/CDS to Yuanchu/CDS"

This reverts commit d629ab16d519e501def772aecc8ef51ecc712888.