Revert "Merge branch 'develop' of https://github.com/project8/monarch into develop"

This reverts commit 7498b893fa60059d8dfbbce4615d44de60b2bb2c, reversing
changes made to 7d1f795300d6bf78e15f97d94925e3ffbc4370fb.