Revert "fix for issue #10880"

This reverts commit 0df070a8e4f6718e3cd86aa4d5a5fc62c53f6eee.