This reverts commit 302d0d36 (7e9e96ba and bd912b7b), reversing changes made to fc6992b3.
Closes #4215 (closed)