We need to re-add #161 , but only after fixing the underlying issues; or conditionalizing on newer .NET versions that have the fixes.
