194dc7da78
Originally authored by @tbosch, this reverts the revert commit e274ff8a69ca8e59237b6d0e01a8e2e9292f2142. Closes #4805