Restored .NET 4.0 compatibility