Revert "New version for new CarteBlanche"

This reverts commit 326d1021fca51d638aed2f7c369c0d1480e6b287.