Revert "Merge branch 'feature/circleci' into develop"

This reverts commit d7268159bf57ab88fee07df8e89b74bcffab913d, reversing
changes made to 009d223cd42d07a6096fc6a1589c6af797316dd7.