Revert "remove revision from CDSetup"

This reverts commit 7c37cbbe97b82484785e99d00cdcdc84d406d7a9.
Revert "add CDSetup"

This reverts commit 8980001a693c29221bc764efee47d23cdbf98c60.