Revert "Merge branch 'develop' into release-0.3"

This reverts commit 92541f2c93a697376925dcacf07e7a73a28c563e, reversing
changes made to 35f946e15dfe765c7191a4d0e9614ac615c59d70.