Revert "Revert "Updated to handle roslyn changes""

This reverts commit 069dfb964a86ab505dd6df5e5495434072346b6c.