Undid changes where contextual semantics are taken into account.
Addressed CR feedback.
Merge pull request #865 from Microsoft/undoContextualSemanticClassification

Undid changes where contextual semantics are taken into account.