Revert "Fix for issue 11108"

This reverts commit c930d8bd5e5246653a0300aac791b4c82b0466c5.