Revert "New version for new CarteBlanche"

This reverts commit 738059b90d907bcd4005634bc4332196ca3aef4e.