Revert "Merge branch 'development'"

This reverts commit f8da09e657ac6a2e9c4ac4b2cb88d20156510230, reversing
changes made to ef37b054a03a8059398bcf59fe1fd69646eee007.