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

This reverts commit 8647d077c7aec851bb2a2c0310a03984d6d91d98, reversing
changes made to fd6fb3a66bce403bae5c7c37adddcc1b218a0f85.