Reverted to .NET 3.5 for compatibility