Revert "Merge branch 'develop'"

This reverts commit 735c9a66bad1953d73683157763ec9ce8431ce73, reversing
changes made to 629292bb299526a97c36cd509ccfae75b6a6cde1.