Revert "Merge branch 'develop'"

This reverts commit 53e395e91cb723c1ca0d918b507b06b081429199, reversing
changes made to 5201ff3ec191ad207629f8771adab60f3e6bfb2f.