Removed hack in admin.py