Revert "Merge branch 'development'"

This reverts commit 2f452cae2a0a9a2e3e3f0c7d2cc7a3a69175f62f, reversing
changes made to ffceeb4a32a6f42804f4c6247daae7ac82883c2b.