Revert "This fixes bug #7499."

This reverts commit 8ac373a8b7c08acedb1d09458f0803a8b6382f07.