Revert "Merge branch 'development'"

This reverts commit 4672e64db955fe24863b1247e5daa9d1678b8dfd, reversing
changes made to 66b3e117fc850801e8c357776a16353bc4f30f87.