This reverts commit 07c00671.

The bug is because the check of the GotoHeaderTxt() is inverted.

Actually in the old code it is a bit easier to understand what is intended,
even though it is more verbose, so just revert the commit.