Revert "Fix issue #6833"

This reverts commit f97d07fed0798974aa0c49094453d97ac69e1afd.