Revert previous patch, see discussion on https://github.com/mono/mono/pull/337