Revert "Fixes Issue #5927"

This reverts commit 86448a3acc936842134967ecb0e817d9e2759015.
Fixes Issue #5927