Revert "New version for new CarteBlanche"

This reverts commit dbd845621a579a9ab5a330837c48be24ec9bcf57.