Critical for cmsweb

@mmascher can you include this ? I don`t get how it was working during tests, but I see now its failing. should I create pull request for 3.3.11.rc5 ?