fdo#68594: Revert bnc#758621 commit.

Reverting: 55c63ccfd460895af22e91979967cec15d80b72d
Seems some other fix, fixes the bug as well.