De-khanizing
Merge pull request #2077 from Stanford-Online/jbau-de-khan

De-khanizing