Revert "Merge pull request #40 from devbliss/feature/patchandheaders"

This reverts commit 40beb8ba4854f756aea32be847a52a38a683422f, reversing
changes made to 9e9181d54aea46ddffc4978f4d8e761050fd7486.