Details in bug, but @peterbe and I chatted about this and decided to WONTFIX bug 949280 again and keep the current approach in the Django view.