Revert "Merge pull request #223 from pronebird/master"

This reverts commit ebbf7933cd9086be1c203cb0f8bbdb63032554de, reversing
changes made to c32f53362036bc16f3191f00e931b4a50d9f7903.
Revert "Revert "Merge pull request #223 from pronebird/master""

This reverts commit 80df1493300d5fa0a519430c43b467ec3fae966a.
Revert ebbf793..cd7a51d

This rolls back to commit ebbf7933cd9086be1c203cb0f8bbdb63032554de.