Revert to System.Func due EF issues