Revert "Merge remote-tracking branch 'origin/development' into development"

This reverts commit ba62e2cee2f18fdc2588596aafbf90e08adc81ed, reversing
changes made to 31dce348fa08221a553c5c10eb713c55bedd918b.