As discussed, we need to reduce/simply headers when we can. This will help not only with future troubleshooting, but also with conversion. This could be done for 2.11+, but 2.13 soon before the 2.14 branch opens.