revert r207756

There's nothing wrong with the change itself, but
test/Frontend/rewrite-includes-messages.c fails without another
not-yet-committed fix.
Compute the correct section for zed = foo + 1 in COFF.

This fixes pr19147.

There are a few more related issues to fix, but the testcase in the bug now
passes.