Treat None header value as a forced unset header

Another implementation for #473, alternative #474