Revert "Merge branch 'develop'"

This reverts commit 8324ba693de4bb2b51e22a8926a7accfcec4eec3, reversing
changes made to d0f70af5decabfa77f77fd886baa50de423a81f9.