Revert "New version for new CarteBlanche"

This reverts commit 73404ab0823e8a2c9ee15102037a1451b31a2c23.