Remove previous "headers" commit from this pull request