Revert "Merge branch 'develop'"

This reverts commit 094ef50ae074d12a2a56812b38e48913ee57dd20, reversing
changes made to bbfc4286b66312cf238590f9e30c4cdd88d55ca5.