Merge pull request #4348 from mpg/revert-4334-dev

Revert 4334 from development