Revert "Merge branch 'pr/12' into develop"

This reverts commit a92f583394a582b89ce7c5f17dbbbb28fd7ae3a9, reversing
changes made to 9af98ec456a6f43b85be5b420001868e9c899d58.