revert parts of the fix for bnc#768686