Removed changes wrongly committed with issue #316
Merge pull request #327 from molovo/doh

Removed changes wrongly committed with issue #316