This reverts commit 06e137aee9.
06e137aee9
Closes #3904 // FREEBIE
Fixes #3347 Closes #3408 // FREEBIE