Revert "anydb - merge upstream changes". Breaks cart

This reverts commit 7417e5d01c5543f58b013977de88047b6d483262.