Revert fix for bug #339939, pending discussion.

This reverts commit abb7c534eee48795354ae3ab1b17ef319bf5e6e3.
1 file changed