Revert "Merge pull request #1 from zajacm/develop"

This reverts commit 21cd3bdb29d88fc1685346a787a51c3b6ab3ee04, reversing
changes made to 5a3912dd102d5713b36e9394a1cc29bfe39d42fb.