Fix for issue #1689 was reverted.