Towards monkey patching my way around https://code.djangoproject.com/ticket/13843