Revert "Fix for issue #8027"

This reverts commit 4247431de567d03d654a1a632c77365eb9badf67.