Revert previous try for fixing #1869