Merge pull request #2202 from mono/revert-2090-mono-4.2.0-branch-bug25480