Bug 905976 - (Followup #893707) - [bb][refactor] Headers
Merge pull request #73 from basiclines/refactor-headers

Bug 905976 - (Followup #893707) - [bb][refactor] Headers