Revert "Merge pull request #1 from vertis/master"

This reverts commit 8258a1ac927c45ea7ef959c0a6ac93bd3af8d172, reversing
changes made to 74d0ea0398a4e4f058ba37ba012308e3dd656eea.
Merge branch 'revert_pull_request_1'

* revert_pull_request_1:
  Revert "Merge pull request #1 from vertis/master"