Reverted fix for bug #4689 (closes #4987): Fix seems to cause problems, reinvestiatio...