Revert "Merge branch 'develop'"

This reverts commit 5af43b391db1abb9e727d98a0337ff2ad35ffec3, reversing
changes made to a0a0d49af6ac6394bcfd8ad8476a0270aefb9605.