Relax headers type constraints
Merge bug25733