Revert "Merge branch 'CartBlanche'"

This reverts commit 398ad593c3717fd13257c988c056a859fb1a7d09, reversing
changes made to 94e65af914758377addb278530a9fb8fc56400a2.