Revert "Merge branch 'development'"

This reverts commit 2e425e503c4bde56f1d71771373cf61b704259e0, reversing
changes made to 32fbfd3e40f92658c3ccc6334e23e10a019267ee.