Revert "Merge remote-tracking branch 'origin/develop' into develop"

This reverts commit 27ea4e82afa51746382dd557e005307653f7d6cf, reversing
changes made to 3d7e10966b7f7c244899971e6c8ad210dd40513c.