This reverts commit 07ebaf83. This also reopens PR #3275 which brought the change now reverted. Fixes #3384 Closes #3439