Revert refactor that won't work on C# 7
Revert refactor that won't work on C# 7

JasonBock/csla,rockfordlhotka/csla,rockfordlhotka/csla,jonnybee/csla,jonnybee/csla,JasonBock/csla,JasonBock/csla,MarimerLLC/csla,MarimerLLC/csla,rockfordlhotka/csla,MarimerLLC/csla,jonnybee/csla