Revert "headerwrap"

This reverts commit c9008f1cc410f6005ddb7688b8ff4e2e4af717e4.