ensure late updating of CSP (bug 1051784)