Revert "Reacting to Roslyn changes"

This reverts commit 27b88850b8b00b32e46c1c8c2e969dee528b95f8.