Revert "Merge branch 'develop'"

This reverts commit fad479a2990a2a4ef0a77a0f126e74f75490e36c, reversing
changes made to 7f5142c5350be6aa2ba68354eb5d553b09cfec12.