location-header: tweak location header handling

- Fix potentially sending the location header into PSOL twice.
- Be more thorough when unsetting the location header