Merge pull request #3124 from mono/revert-2734-master