Revert "Merge branch 'development'"

This reverts commit 65ba7f93e26b24abeb886601899707a25db68c3c, reversing
changes made to b8cfef35befe327ebc20982b68b669f20664aec1.