Merge pull request #4771 from mono/revert-4765-master