This reverts commit ceb9b1f6ec.
I need to look at this again, there is a report that commit in question
may cause problems and apparently logic may have failed me when I
removed this code, as it probably should stay and everything after it is
Signed-off-by: Amadeusz Sławiński <firstname.lastname@example.org>