Revert "Attempting to fix an empty cart crash"

This reverts commit 7b871eb214355e14ef93383bbbd83f4c43b8d9df.