Revert "Fix for checkout overwriting orders"

This reverts commit e500a5eec747622c86ac41a76739984b01a455f6.
versioning