Revert "dlgood resolving h1 conflict"

This reverts commit d2e30df699726dda403d3226124ba39fe7f78cd1, reversing
changes made to 63e751aff642e0d93c63913df9e7ea993dfd9b9b.