revert 6699bea4579b9f200179cdd176889e17dcfd2c55 partially
revert 6699bea4579b9f200179cdd176889e17dcfd2c55 partially

awesto/django-shop,awesto/django-shop,awesto/django-shop,divio/django-shop,divio/django-shop,divio/django-shop