Revert the last two commits (fix for #6386). The actual problem