Stripped so that it can now compile to .NET 3.0
Fixed merge issue.