Merge pull request #1575 from mono/revert-1574-patch-1