Revert "Merge branch 'hotfix/17'"

This reverts commit cc73cfa548cf4ae2b08d3edfaa412c5f03541090, reversing
changes made to 1d2de8c6eeb481a9bfa581b95ff2e7c38d063970.