Revert "Issue/PR #3836"

This reverts commit 170ae282338584ebe257d2fb21101ccf84a3f800.
2 files changed