Even with the proposed fix of commit id d999ae10 it still seems
to be broken with reference to i#112978 . Maybe a better way
of fixing it. Hence reverting this patch partially to fix fdo#45260
Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>