Bug 919669 - set proper headers