Revert "Merge branch 'develop'"

This reverts commit bc3243e9db640bcb9fcac33511903becfa3318ec.