This commit reverts the fix for fdo#44176, and implements a better fix,
which keeps the original testcase passing, but also fixes the layout of
a simple document, having different first, odd and even headers within
the same section.

Change-Id: I96893ce3e886e479f1d7640b126ad7a1dd828bdb